null+****@clear*****
null+****@clear*****
2010年 11月 21日 (日) 02:24:21 JST
Tetsuro IKEDA 2010-11-20 17:24:21 +0000 (Sat, 20 Nov 2010)
New Revision: b39be91d8a221c0273bb37f4a1e8c4ee76b2f2fb
Log:
added include file to test-suite.
Copied files:
test/sql/include/groonga.inc
(from test/sql/t/information_schema.test)
Modified files:
test/sql/r/binlog.result
test/sql/r/btree.result
test/sql/r/count_performance.result
test/sql/r/create_table.result
test/sql/r/delete.result
test/sql/r/drop_database.result
test/sql/r/drop_table.result
test/sql/r/fulltext.result
test/sql/r/hash.result
test/sql/r/information_schema.result
test/sql/r/insert.result
test/sql/r/last_insert_grn_id.result
test/sql/r/select_all.result
test/sql/r/select_pkey.result
test/sql/r/select_secondary_key.result
test/sql/r/show_create_table.result
test/sql/r/show_table_status.result
test/sql/r/update.result
test/sql/t/binlog.test
test/sql/t/btree.test
test/sql/t/count_performance.test
test/sql/t/create_table.test
test/sql/t/delete.test
test/sql/t/drop_database.test
test/sql/t/drop_table.test
test/sql/t/fulltext.test
test/sql/t/hash.test
test/sql/t/information_schema.test
test/sql/t/insert.test
test/sql/t/last_insert_grn_id.test
test/sql/t/select_all.test
test/sql/t/select_pkey.test
test/sql/t/select_secondary_key.test
test/sql/t/show_create_table.test
test/sql/t/show_table_status.test
test/sql/t/update.test
Copied: test/sql/include/groonga.inc (+7 -12) 69%
===================================================================
--- test/sql/t/information_schema.test 2010-11-20 16:19:45 +0000 (f42f2ff)
+++ test/sql/include/groonga.inc 2010-11-20 17:24:21 +0000 (e45e2f9)
@@ -14,16 +14,11 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-install plugin groonga_stats soname 'ha_groonga.so';
+disable_query_log;
+if (!`SELECT 1 FROM information_schema.plugins WHERE plugin_name="groonga"`)
+{
+ INSTALL PLUGIN groonga SONAME 'ha_groonga.so';
+ INSTALL PLUGIN groonga_stats SONAME 'ha_groonga.so';
+}
set storage_engine=groonga;
-drop table if exists t1;
---enable_warnings
-
-select count(*) from information_schema.plugins where plugin_name = "groonga";
-
---disable_warnings
-uninstall plugin groonga_stats;
-uninstall plugin groonga;
---enable_warnings
+enable_query_log;
Modified: test/sql/r/binlog.result (+0 -3)
===================================================================
--- test/sql/r/binlog.result 2010-11-20 16:19:45 +0000 (bf7a37c)
+++ test/sql/r/binlog.result 2010-11-20 17:24:21 +0000 (1ac2693)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1;
show variables like 'log_bin';
Variable_name Value
@@ -34,4 +32,3 @@ c1 c2
1 100
2 100
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/btree.result (+0 -3)
===================================================================
--- test/sql/r/btree.result 2010-11-20 16:19:45 +0000 (5c897b5)
+++ test/sql/r/btree.result 2010-11-20 17:24:21 +0000 (fe0265f)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 int, index using btree (c2));
show create table t1;
@@ -25,4 +23,3 @@ c1 c2
2 101
3 102
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/count_performance.result (+0 -3)
===================================================================
--- test/sql/r/count_performance.result 2010-11-20 16:19:45 +0000 (66d0180)
+++ test/sql/r/count_performance.result 2010-11-20 17:24:21 +0000 (2b92d79)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 int, c3 text, key idx1(c2), fulltext index ft(c3));
insert into t1 values(1,10,"aa ii uu ee oo");
@@ -105,4 +103,3 @@ show status like 'groonga_count_skip';
Variable_name Value
groonga_count_skip 5
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/create_table.result (+0 -3)
===================================================================
--- test/sql/r/create_table.result 2010-11-20 16:19:45 +0000 (23a6bec)
+++ test/sql/r/create_table.result 2010-11-20 17:24:21 +0000 (2ba6f5e)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int);
create table t2 (c1 int);
@@ -182,4 +180,3 @@ create table t1 (_id int, c1 int, key (_id));
ERROR HY000: only hash index can be defined for _id
create table t1 (_id int, c1 int, key (_id) using hash);
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/delete.result (+0 -3)
===================================================================
--- test/sql/r/delete.result 2010-11-20 16:19:45 +0000 (853843d)
+++ test/sql/r/delete.result 2010-11-20 17:24:21 +0000 (5a74d2c)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int, c2 int);
show create table t1;
@@ -54,4 +52,3 @@ c1 c2
select * from t1 where match(c2) against("ki");
c1 c2
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/drop_database.result (+0 -3)
===================================================================
--- test/sql/r/drop_database.result 2010-11-20 16:19:45 +0000 (0b4c6c5)
+++ test/sql/r/drop_database.result 2010-11-20 17:24:21 +0000 (4bd9716)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop database if exists groonga;
create database groonga;
drop database groonga;
@@ -14,4 +12,3 @@ create table t1 (c1 int primary key, c2 varchar(255)) default charset utf8;
create table t2 (c1 int primary key, c2 varchar(255)) default charset utf8;
drop table t1, t2;
drop database groonga;
-uninstall plugin groonga;
Modified: test/sql/r/drop_table.result (+0 -3)
===================================================================
--- test/sql/r/drop_table.result 2010-11-20 16:19:45 +0000 (738b7ee)
+++ test/sql/r/drop_table.result 2010-11-20 17:24:21 +0000 (bd664e9)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 int, c3 int);
create table t2 (c1 int primary key, c2 int, c3 int);
@@ -7,4 +5,3 @@ create table t3 (c1 int primary key, c2 int, c3 int);
drop table t1;
drop table t2;
drop table t3;
-uninstall plugin groonga;
Modified: test/sql/r/fulltext.result (+0 -3)
===================================================================
--- test/sql/r/fulltext.result 2010-11-20 16:19:45 +0000 (0b4bd2a)
+++ test/sql/r/fulltext.result 2010-11-20 17:24:21 +0000 (f9241b4)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 text, fulltext index ft (c2));
show create table t1;
@@ -202,4 +200,3 @@ c1 c2 c3 _score
2 10 ka ki ku ke ko 0
4 10 ka ki ku ke ko 0
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/hash.result (+0 -3)
===================================================================
--- test/sql/r/hash.result 2010-11-20 16:19:45 +0000 (d5f2171)
+++ test/sql/r/hash.result 2010-11-20 17:24:21 +0000 (d1c6ae2)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 int, index using hash (c2));
show create table t1;
@@ -86,4 +84,3 @@ _id a
select * from t1 where _id = 20;
_id a
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/information_schema.result (+0 -6)
===================================================================
--- test/sql/r/information_schema.result 2010-11-20 16:19:45 +0000 (f9d2713)
+++ test/sql/r/information_schema.result 2010-11-20 17:24:21 +0000 (c78f667)
@@ -1,9 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-install plugin groonga_stats soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
select count(*) from information_schema.plugins where plugin_name = "groonga";
count(*)
1
-uninstall plugin groonga_stats;
-uninstall plugin groonga;
Modified: test/sql/r/insert.result (+1 -4)
===================================================================
--- test/sql/r/insert.result 2010-11-20 16:19:45 +0000 (87d9e93)
+++ test/sql/r/insert.result 2010-11-20 17:24:21 +0000 (8145920)
@@ -1,6 +1,4 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
+drop table if exists t1, t2, t3;
create table t1 (c1 tinyint);
insert into t1 values(1);
select * from t1;
@@ -92,4 +90,3 @@ c1 _id _score
2 2 0
3 3 0
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/last_insert_grn_id.result (+2 -4)
===================================================================
--- test/sql/r/last_insert_grn_id.result 2010-11-20 16:19:45 +0000 (23572b0)
+++ test/sql/r/last_insert_grn_id.result 2010-11-20 17:24:21 +0000 (8566e7f)
@@ -1,6 +1,5 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
+drop table if exists t1, t2, t3;
+drop function if exists last_insert_grn_id;
create function last_insert_grn_id returns integer soname 'ha_groonga.so';
create table t1 (_id int, c1 int);
select last_insert_grn_id();
@@ -30,4 +29,3 @@ select last_insert_grn_id(1);
ERROR HY000: Can't initialize function 'last_insert_grn_id'; last_insert_grn_id must not have arguments
drop table t1;
drop function last_insert_grn_id;
-uninstall plugin groonga;
Modified: test/sql/r/select_all.result (+0 -3)
===================================================================
--- test/sql/r/select_all.result 2010-11-20 16:19:45 +0000 (1dec8a8)
+++ test/sql/r/select_all.result 2010-11-20 17:24:21 +0000 (18318bd)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1(c1 int, c2 int, c3 int);
insert into t1 values (1, 10, 100);
@@ -198,4 +196,3 @@ _id c1
4 100
5 100
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/select_pkey.result (+0 -3)
===================================================================
--- test/sql/r/select_pkey.result 2010-11-20 16:19:45 +0000 (d503cdb)
+++ test/sql/r/select_pkey.result 2010-11-20 17:24:21 +0000 (99f69f4)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1(c1 int primary key, c2 int, c3 int);
insert into t1 values (1, 10, 100);
@@ -27,4 +25,3 @@ select * from t1 where c1=6;
c1 c2 c3
6 40 400
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/select_secondary_key.result (+0 -3)
===================================================================
--- test/sql/r/select_secondary_key.result 2010-11-20 16:19:45 +0000 (1e9e475)
+++ test/sql/r/select_secondary_key.result 2010-11-20 17:24:21 +0000 (4c7832f)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int primary key, c2 int, c3 text, key idx1(c2), fulltext index ft(c3))engine=groonga;
insert into t1 values(1,10,"aa ii uu ee oo");
@@ -42,4 +40,3 @@ de cde ta ti tu te to
cd efg sa si su se so
bc ghi ka ki ku ke ko
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/r/show_create_table.result (+1 -7)
===================================================================
--- test/sql/r/show_create_table.result 2010-11-20 16:19:45 +0000 (f2607c9)
+++ test/sql/r/show_create_table.result 2010-11-20 17:24:21 +0000 (433bf5a)
@@ -1,8 +1,4 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop database if exists db1;
-create database db1;
-use db1;
+drop table if exists t1, t2, t3;
create table t1 (c1 int);
show create table t1;
Table Create Table
@@ -27,5 +23,3 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`c1`)
) ENGINE=groonga DEFAULT CHARSET=latin1
drop table t1;
-drop database db1;
-uninstall plugin groonga;
Modified: test/sql/r/show_table_status.result (+2 -7)
===================================================================
--- test/sql/r/show_table_status.result 2010-11-20 16:19:45 +0000 (91168ca)
+++ test/sql/r/show_table_status.result 2010-11-20 17:24:21 +0000 (00b7389)
@@ -1,8 +1,4 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop database if exists db1;
-create database db1;
-use db1;
+drop table if exists t1, t2, t3;
create table t1 (c1 int);
show table status;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
@@ -15,5 +11,4 @@ t2 groonga 10 Fixed 0 0 0 0 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
show table status like 't2';
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t2 groonga 10 Fixed 0 0 0 0 0 0 NULL NULL NULL NULL latin1_swedish_ci NULL
-drop database db1;
-uninstall plugin groonga;
+drop table t1,t2;
Modified: test/sql/r/update.result (+0 -3)
===================================================================
--- test/sql/r/update.result 2010-11-20 16:19:45 +0000 (0aea290)
+++ test/sql/r/update.result 2010-11-20 17:24:21 +0000 (541a8f3)
@@ -1,5 +1,3 @@
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
create table t1 (c1 int, c2 int);
show create table t1;
@@ -101,4 +99,3 @@ c1 _id _score
2 2 0
3 3 0
drop table t1;
-uninstall plugin groonga;
Modified: test/sql/t/binlog.test (+1 -6)
===================================================================
--- test/sql/t/binlog.test 2010-11-20 16:19:45 +0000 (8adad40)
+++ test/sql/t/binlog.test 2010-11-20 17:24:21 +0000 (13c7b88)
@@ -15,10 +15,9 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
source include/have_log_bin.inc;
+source suite/groonga/include/groonga.inc;
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1;
--enable_warnings
@@ -50,7 +49,3 @@ insert into t1 values(2,100);
commit;
select * from t1;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/btree.test (+2 -6)
===================================================================
--- test/sql/t/btree.test 2010-11-20 16:19:45 +0000 (ec4d40c)
+++ test/sql/t/btree.test 2010-11-20 17:24:21 +0000 (5d9b190)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -29,7 +29,3 @@ select * from t1;
flush tables;
select * from t1;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/count_performance.test (+2 -6)
===================================================================
--- test/sql/t/count_performance.test 2010-11-20 16:19:45 +0000 (91ef829)
+++ test/sql/t/count_performance.test 2010-11-20 17:24:21 +0000 (f6bc581)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -56,7 +56,3 @@ show status like 'groonga_count_skip';
select count(*) from t1 force index(idx1) where c2 between 20 and 40;
show status like 'groonga_count_skip';
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/create_table.test (+2 -6)
===================================================================
--- test/sql/t/create_table.test 2010-11-20 16:19:45 +0000 (bc8c388)
+++ test/sql/t/create_table.test 2010-11-20 17:24:21 +0000 (9d85289)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -150,7 +150,3 @@ drop table t1;
create table t1 (_id int, c1 int, key (_id));
create table t1 (_id int, c1 int, key (_id) using hash);
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/delete.test (+2 -7)
===================================================================
--- test/sql/t/delete.test 2010-11-20 16:19:45 +0000 (474bb92)
+++ test/sql/t/delete.test 2010-11-20 17:24:21 +0000 (0b5ff47)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -53,8 +53,3 @@ select * from t1;
select * from t1 where match(c2) against("ki");
drop table t1;
-
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/drop_database.test (+2 -7)
===================================================================
--- test/sql/t/drop_database.test 2010-11-20 16:19:45 +0000 (c093953)
+++ test/sql/t/drop_database.test 2010-11-20 17:24:21 +0000 (e3bcea9)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop database if exists groonga;
--enable_warnings
@@ -35,8 +35,3 @@ create table t1 (c1 int primary key, c2 varchar(255)) default charset utf8;
create table t2 (c1 int primary key, c2 varchar(255)) default charset utf8;
drop table t1, t2;
drop database groonga;
-
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/drop_table.test (+2 -6)
===================================================================
--- test/sql/t/drop_table.test 2010-11-20 16:19:45 +0000 (0eaaee6)
+++ test/sql/t/drop_table.test 2010-11-20 17:24:21 +0000 (2225bd6)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -27,7 +27,3 @@ create table t3 (c1 int primary key, c2 int, c3 int);
drop table t1;
drop table t2;
drop table t3;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/fulltext.test (+2 -6)
===================================================================
--- test/sql/t/fulltext.test 2010-11-20 16:19:45 +0000 (bf81c05)
+++ test/sql/t/fulltext.test 2010-11-20 17:24:21 +0000 (5074849)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -97,7 +97,3 @@ select * from t1 where c2 = 10 and not match(c3) against("uu");
select * from t1 where c2 >= 15 and not match(c3) against("uu");
select * from t1 where c2 < 15 and not match(c3) against("uu");
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/hash.test (+2 -6)
===================================================================
--- test/sql/t/hash.test 2010-11-20 16:19:45 +0000 (5289690)
+++ test/sql/t/hash.test 2010-11-20 17:24:21 +0000 (de30b29)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -63,7 +63,3 @@ select * from t1;
select * from t1 where _id = 2;
select * from t1 where _id = 20;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/information_schema.test (+1 -11)
===================================================================
--- test/sql/t/information_schema.test 2010-11-20 16:19:45 +0000 (f42f2ff)
+++ test/sql/t/information_schema.test 2010-11-20 17:24:21 +0000 (a2c0385)
@@ -14,16 +14,6 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
---disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-install plugin groonga_stats soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
---enable_warnings
+--source suite/groonga/include/groonga.inc
select count(*) from information_schema.plugins where plugin_name = "groonga";
-
---disable_warnings
-uninstall plugin groonga_stats;
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/insert.test (+3 -7)
===================================================================
--- test/sql/t/insert.test 2010-11-20 16:19:45 +0000 (fe96d8f)
+++ test/sql/t/insert.test 2010-11-20 17:24:21 +0000 (c5d00b9)
@@ -14,10 +14,10 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
+drop table if exists t1, t2, t3;
--enable_warnings
# data types
@@ -95,7 +95,3 @@ insert into t1 (c1,_score) values (5,2);
insert into t1 (c1,_id,_score) values (6,1,2);
select * from t1;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/last_insert_grn_id.test (+4 -7)
===================================================================
--- test/sql/t/last_insert_grn_id.test 2010-11-20 16:19:45 +0000 (4d47d54)
+++ test/sql/t/last_insert_grn_id.test 2010-11-20 17:24:21 +0000 (bc81833)
@@ -14,10 +14,11 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop table if exists t1;
+drop table if exists t1, t2, t3;
+drop function if exists last_insert_grn_id;
--enable_warnings
create function last_insert_grn_id returns integer soname 'ha_groonga.so';
@@ -43,7 +44,3 @@ select last_insert_grn_id(1);
drop table t1;
drop function last_insert_grn_id;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/select_all.test (+2 -6)
===================================================================
--- test/sql/t/select_all.test 2010-11-20 16:19:45 +0000 (f06713e)
+++ test/sql/t/select_all.test 2010-11-20 17:24:21 +0000 (86c2905)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -96,7 +96,3 @@ select * from t1;
select * from t1 where _id < 3;
select * from t1 where _id >= 3;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/select_pkey.test (+2 -6)
===================================================================
--- test/sql/t/select_pkey.test 2010-11-20 16:19:45 +0000 (d453c1a)
+++ test/sql/t/select_pkey.test 2010-11-20 17:24:21 +0000 (ca95369)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -36,7 +36,3 @@ select * from t1 where c1=5;
select * from t1 where c1=6;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/select_secondary_key.test (+2 -6)
===================================================================
--- test/sql/t/select_secondary_key.test 2010-11-20 16:19:45 +0000 (4f701b9)
+++ test/sql/t/select_secondary_key.test 2010-11-20 17:24:21 +0000 (aa6f979)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -42,7 +42,3 @@ select * from t1 force index(idx1) where c2 < 'e';
select * from t1 force index(idx1) where c2 > 'e';
select * from t1 force index(idx1) where c2 between 'c' and 'h';
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/show_create_table.test (+3 -10)
===================================================================
--- test/sql/t/show_create_table.test 2010-11-20 16:19:45 +0000 (d249025)
+++ test/sql/t/show_create_table.test 2010-11-20 17:24:21 +0000 (ea1a49c)
@@ -14,12 +14,10 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop database if exists db1;
-create database db1;
-use db1;
+drop table if exists t1, t2, t3;
--enable_warnings
create table t1 (c1 int);
@@ -33,8 +31,3 @@ drop table t1;
create table t1 (c1 int primary key, c2 varchar(100));
show create table t1;
drop table t1;
-
---disable_warnings
-drop database db1;
-uninstall plugin groonga;
---enable_warnings
Modified: test/sql/t/show_table_status.test (+4 -9)
===================================================================
--- test/sql/t/show_table_status.test 2010-11-20 16:19:45 +0000 (0a5cdba)
+++ test/sql/t/show_table_status.test 2010-11-20 17:24:21 +0000 (db3223d)
@@ -14,12 +14,10 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
-drop database if exists db1;
-create database db1;
-use db1;
+drop table if exists t1, t2, t3;
--enable_warnings
create table t1 (c1 int);
@@ -30,7 +28,4 @@ show table status;
show table status like 't2';
---disable_warnings
-drop database db1;
-uninstall plugin groonga;
---enable_warnings
+drop table t1,t2;
Modified: test/sql/t/update.test (+2 -6)
===================================================================
--- test/sql/t/update.test 2010-11-20 16:19:45 +0000 (34f8e9c)
+++ test/sql/t/update.test 2010-11-20 17:24:21 +0000 (dc87b89)
@@ -14,9 +14,9 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--source suite/groonga/include/groonga.inc
+
--disable_warnings
-install plugin groonga soname 'ha_groonga.so';
-set storage_engine=groonga;
drop table if exists t1, t2, t3;
--enable_warnings
@@ -77,7 +77,3 @@ update t1 set _score = 22 where c1 = 2;
update t1 set _id = 11, _score = 22 where c1 = 3;
select * from t1;
drop table t1;
-
---disable_warnings
-uninstall plugin groonga;
---enable_warnings