mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
client/mysqlmanagerc.c
added support for quiet
increased line buffer size
client/mysqltest.c
fixed memory leak
added query logging to result file
added error message logging to result file
added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh
converted tests to use mysqlmanager
Updated test results
BitKeeper/etc/ignore:
added *.reject
client/mysqlmanagerc.c:
added support for quiet
increased line buffer size
client/mysqltest.c:
fixed memory leak
added query logging to result file
added error message logging to result file
added enable_query_log/disable_query_log
mysql-test/mysql-test-run.sh:
converted tests to use mysqlmanager
mysql-test/r/alias.result:
log queries
mysql-test/r/alter_table.result:
log queries
mysql-test/r/analyse.result:
log queries
mysql-test/r/auto_increment.result:
log queries
mysql-test/r/backup.result:
log queries
mysql-test/r/bdb-crash.result:
log queries
mysql-test/r/bench_count_distinct.result:
log queries
mysql-test/r/bigint.result:
log queries
mysql-test/r/binary.result:
log queries
mysql-test/r/bulk_replace.result:
log queries
mysql-test/r/case.result:
log queries
mysql-test/r/check.result:
log queries
mysql-test/r/comments.result:
log queries
mysql-test/r/compare.result:
log queries
mysql-test/r/count_distinct.result:
log queries
mysql-test/r/count_distinct2.result:
log queries
mysql-test/r/create.result:
log queries
mysql-test/r/ctype_latin1_de.result:
log queries
mysql-test/r/delayed.result:
log queries
mysql-test/r/dirty-close.result:
log queries
mysql-test/r/distinct.result:
log queries
mysql-test/r/drop.result:
log queries
mysql-test/r/empty_table.result:
log queries
mysql-test/r/explain.result:
log queries
mysql-test/r/flush.result:
log queries
mysql-test/r/fulltext.result:
log queries
mysql-test/r/fulltext_cache.result:
log queries
mysql-test/r/fulltext_distinct.result:
log queries
mysql-test/r/fulltext_left_join.result:
log queries
mysql-test/r/fulltext_multi.result:
log queries
mysql-test/r/fulltext_order_by.result:
log queries
mysql-test/r/fulltext_update.result:
log queries
mysql-test/r/fulltext_var.result:
log queries
mysql-test/r/func_crypt.result:
log queries
mysql-test/r/func_date_add.result:
log queries
mysql-test/r/func_equal.result:
log queries
mysql-test/r/func_group.result:
log queries
mysql-test/r/func_in.result:
log queries
mysql-test/r/func_like.result:
log queries
mysql-test/r/func_math.result:
log queries
mysql-test/r/func_misc.result:
log queries
mysql-test/r/func_op.result:
log queries
mysql-test/r/func_regexp.result:
log queries
mysql-test/r/func_set.result:
log queries
mysql-test/r/func_str.result:
log queries
mysql-test/r/func_system.result:
log queries
mysql-test/r/func_test.result:
log queries
mysql-test/r/func_time.result:
log queries
mysql-test/r/func_timestamp.result:
log queries
mysql-test/r/group_by.result:
log queries
mysql-test/r/handler.result:
log queries
mysql-test/r/having.result:
log queries
mysql-test/r/heap.result:
log queries
mysql-test/r/identity.result:
log queries
mysql-test/r/ins000001.result:
log queries
mysql-test/r/insert.result:
log queries
mysql-test/r/insert_select.result:
log queries
mysql-test/r/isam.result:
log queries
mysql-test/r/join.result:
log queries
mysql-test/r/join_crash.result:
log queries
mysql-test/r/join_outer.result:
log queries
mysql-test/r/key.result:
log queries
mysql-test/r/key_diff.result:
log queries
mysql-test/r/key_primary.result:
log queries
mysql-test/r/keywords.result:
log queries
mysql-test/r/kill.result:
log queries
mysql-test/r/limit.result:
log queries
mysql-test/r/lock.result:
log queries
mysql-test/r/merge.result:
log queries
mysql-test/r/multi_update.result:
log queries
mysql-test/r/myisam.result:
log queries
mysql-test/r/null.result:
log queries
mysql-test/r/null_key.result:
log queries
mysql-test/r/odbc.result:
log queries
mysql-test/r/openssl_1.result:
log queries
mysql-test/r/openssl_2.result:
log queries
mysql-test/r/order_by.result:
log queries
mysql-test/r/order_fill_sortbuf.result:
log queries
mysql-test/r/raid.result:
log queries
mysql-test/r/range.result:
log queries
mysql-test/r/rename.result:
log queries
mysql-test/r/replace.result:
log queries
mysql-test/r/rollback.result:
log queries
mysql-test/r/rpl000001.result:
log queries
mysql-test/r/rpl000002.result:
log queries
mysql-test/r/rpl000003.result:
log queries
mysql-test/r/rpl000004.result:
log queries
mysql-test/r/rpl000005.result:
log queries
mysql-test/r/rpl000006.result:
log queries
mysql-test/r/rpl000007.result:
log queries
mysql-test/r/rpl000008.result:
log queries
mysql-test/r/rpl000009.result:
log queries
mysql-test/r/rpl000010.result:
log queries
mysql-test/r/rpl000011.result:
log queries
mysql-test/r/rpl000012.result:
log queries
mysql-test/r/rpl000013.result:
log queries
mysql-test/r/rpl000014.result:
log queries
mysql-test/r/rpl000015.result:
log queries
mysql-test/r/rpl000016.result:
log queries
mysql-test/r/rpl000017.result:
log queries
mysql-test/r/rpl000018.result:
log queries
mysql-test/r/rpl_get_lock.result:
log queries
mysql-test/r/rpl_log.result:
log queries
mysql-test/r/rpl_magic.result:
log queries
mysql-test/r/rpl_mystery22.result:
log queries
mysql-test/r/rpl_sporadic_master.result:
log queries
mysql-test/r/sel000001.result:
log queries
mysql-test/r/sel000002.result:
log queries
mysql-test/r/sel000003.result:
log queries
mysql-test/r/sel000031.result:
log queries
mysql-test/r/sel000032.result:
log queries
mysql-test/r/sel000033.result:
log queries
mysql-test/r/sel000100.result:
log queries
mysql-test/r/select.result:
log queries
mysql-test/r/select_found.result:
log queries
mysql-test/r/select_safe.result:
log queries
mysql-test/r/show_check.result:
log queries
mysql-test/r/slave-running.result:
log queries
mysql-test/r/slave-stopped.result:
log queries
mysql-test/r/status.result:
log queries
mysql-test/r/symlink.result:
log queries
mysql-test/r/tablelock.result:
log queries
mysql-test/r/temp_table.result:
log queries
mysql-test/r/truncate.result:
log queries
mysql-test/r/type_blob.result:
log queries
mysql-test/r/type_date.result:
log queries
mysql-test/r/type_datetime.result:
log queries
mysql-test/r/type_decimal.result:
log queries
mysql-test/r/type_enum.result:
log queries
mysql-test/r/type_float.result:
log queries
mysql-test/r/type_ranges.result:
log queries
mysql-test/r/type_time.result:
log queries
mysql-test/r/type_timestamp.result:
log queries
mysql-test/r/type_uint.result:
log queries
mysql-test/r/type_year.result:
log queries
mysql-test/r/union.result:
log queries
mysql-test/r/update.result:
log queries
mysql-test/r/user_var.result:
log queries
mysql-test/r/varbinary.result:
log queries
mysql-test/r/variables.result:
log queries
mysql-test/t/bench_count_distinct.test:
log queries
mysql-test/t/check.test:
log queries
mysql-test/t/count_distinct2.test:
log queries
mysql-test/t/flush.test:
log queries
mysql-test/t/isam.test:
log queries
mysql-test/t/multi_update.test:
log queries
mysql-test/t/myisam.test:
log queries
mysql-test/t/order_fill_sortbuf.test:
log queries
mysql-test/t/rpl000016.test:
log queries
tools/managertest1.nc:
test for def_exec overwrite
tools/mysqlmanager.c:
support def_exec overwrite and queries on running server
This commit is contained in:
unknown
@ -1,3 +1,10 @@
|
||||
drop table if exists t1,t2,t3;
|
||||
create table t1 (a int not null primary key auto_increment, message char(20));
|
||||
create table t2 (a int not null primary key auto_increment, message char(20));
|
||||
INSERT INTO t1 (message) VALUES ("Testing"),("table"),("t1");
|
||||
INSERT INTO t2 (message) VALUES ("Testing"),("table"),("t2");
|
||||
create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(t1,t2);
|
||||
select * from t3;
|
||||
a b
|
||||
1 Testing
|
||||
2 table
|
||||
@ -5,6 +12,7 @@ a b
|
||||
1 Testing
|
||||
2 table
|
||||
3 t2
|
||||
select * from t3 order by a desc;
|
||||
a b
|
||||
3 t1
|
||||
3 t2
|
||||
@ -12,13 +20,30 @@ a b
|
||||
2 table
|
||||
1 Testing
|
||||
1 Testing
|
||||
drop table t3;
|
||||
insert into t1 select NULL,message from t2;
|
||||
insert into t2 select NULL,message from t1;
|
||||
insert into t1 select NULL,message from t2;
|
||||
insert into t2 select NULL,message from t1;
|
||||
insert into t1 select NULL,message from t2;
|
||||
insert into t2 select NULL,message from t1;
|
||||
insert into t1 select NULL,message from t2;
|
||||
insert into t2 select NULL,message from t1;
|
||||
insert into t1 select NULL,message from t2;
|
||||
insert into t2 select NULL,message from t1;
|
||||
insert into t1 select NULL,message from t2;
|
||||
create table t3 (a int not null, b char(20), key(a)) type=MERGE UNION=(test.t1,test.t2);
|
||||
explain select * from t3 where a < 10;
|
||||
table type possible_keys key key_len ref rows Extra
|
||||
t3 range a a 4 NULL 10 where used
|
||||
explain select * from t3 where a > 10 and a < 20;
|
||||
table type possible_keys key key_len ref rows Extra
|
||||
t3 range a a 4 NULL 10 where used
|
||||
select * from t3 where a = 10;
|
||||
a b
|
||||
10 Testing
|
||||
10 Testing
|
||||
select * from t3 where a < 10;
|
||||
a b
|
||||
1 Testing
|
||||
1 Testing
|
||||
@ -38,6 +63,7 @@ a b
|
||||
8 table
|
||||
9 t2
|
||||
9 t2
|
||||
select * from t3 where a > 10 and a < 20;
|
||||
a b
|
||||
11 table
|
||||
11 table
|
||||
@ -57,8 +83,10 @@ a b
|
||||
18 t2
|
||||
19 Testing
|
||||
19 Testing
|
||||
explain select a from t3 order by a desc limit 10;
|
||||
table type possible_keys key key_len ref rows Extra
|
||||
t3 index NULL a 4 NULL 1131 Using index
|
||||
select a from t3 order by a desc limit 10;
|
||||
a
|
||||
699
|
||||
698
|
||||
@ -70,6 +98,7 @@ a
|
||||
692
|
||||
691
|
||||
690
|
||||
select a from t3 order by a desc limit 300,10;
|
||||
a
|
||||
416
|
||||
415
|
||||
@ -81,12 +110,29 @@ a
|
||||
412
|
||||
412
|
||||
411
|
||||
show create table t3;
|
||||
Table Create Table
|
||||
t3 CREATE TABLE `t3` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` char(20) default NULL,
|
||||
KEY `a` (`a`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2);
|
||||
select * from t4;
|
||||
Can't open file: 't4.MRG'. (errno: 143)
|
||||
create table t5 (a int not null, b char(10), key(a)) type=MERGE UNION=(test.t1,test_2.t2);
|
||||
Incorrect table definition; All MERGE tables must be in the same database
|
||||
drop table if exists t5,t4,t3,t1,t2;
|
||||
create table t1 (c char(10)) type=myisam;
|
||||
create table t2 (c char(10)) type=myisam;
|
||||
create table t3 (c char(10)) union=(t1,t2) type=merge;
|
||||
insert into t1 (c) values ('test1');
|
||||
insert into t1 (c) values ('test1');
|
||||
insert into t1 (c) values ('test1');
|
||||
insert into t2 (c) values ('test2');
|
||||
insert into t2 (c) values ('test2');
|
||||
insert into t2 (c) values ('test2');
|
||||
select * from t3;
|
||||
c
|
||||
test1
|
||||
test1
|
||||
@ -94,6 +140,7 @@ test1
|
||||
test2
|
||||
test2
|
||||
test2
|
||||
select * from t3;
|
||||
c
|
||||
test1
|
||||
test1
|
||||
@ -101,32 +148,71 @@ test1
|
||||
test2
|
||||
test2
|
||||
test2
|
||||
delete from t3 where 1=1;
|
||||
select * from t3;
|
||||
c
|
||||
select * from t1;
|
||||
c
|
||||
drop table t3,t2,t1;
|
||||
CREATE TABLE t1 (incr int not null, othr int not null, primary key(incr));
|
||||
CREATE TABLE t2 (incr int not null, othr int not null, primary key(incr));
|
||||
CREATE TABLE t3 (incr int not null, othr int not null, primary key(incr))
|
||||
TYPE=MERGE UNION=(t1,t2);
|
||||
SELECT * from t3;
|
||||
incr othr
|
||||
INSERT INTO t1 VALUES ( 1,10),( 3,53),( 5,21),( 7,12),( 9,17);
|
||||
INSERT INTO t2 VALUES ( 2,24),( 4,33),( 6,41),( 8,26),( 0,32);
|
||||
INSERT INTO t1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37);
|
||||
INSERT INTO t2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30);
|
||||
SELECT * from t3 where incr in (1,2,3,4) order by othr;
|
||||
incr othr
|
||||
1 10
|
||||
2 24
|
||||
4 33
|
||||
3 53
|
||||
alter table t3 UNION=(t1);
|
||||
select count(*) from t3;
|
||||
count(*)
|
||||
10
|
||||
alter table t3 UNION=(t1,t2);
|
||||
select count(*) from t3;
|
||||
count(*)
|
||||
20
|
||||
alter table t3 TYPE=MYISAM;
|
||||
select count(*) from t3;
|
||||
count(*)
|
||||
20
|
||||
drop table t3;
|
||||
CREATE TABLE t3 (incr int not null, othr int not null, primary key(incr))
|
||||
TYPE=MERGE UNION=(t1,t2);
|
||||
show create table t3;
|
||||
Table Create Table
|
||||
t3 CREATE TABLE `t3` (
|
||||
`incr` int(11) NOT NULL default '0',
|
||||
`othr` int(11) NOT NULL default '0',
|
||||
PRIMARY KEY (`incr`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
alter table t3 drop primary key;
|
||||
show create table t3;
|
||||
Table Create Table
|
||||
t3 CREATE TABLE `t3` (
|
||||
`incr` int(11) NOT NULL default '0',
|
||||
`othr` int(11) NOT NULL default '0'
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
drop table t3,t2,t1;
|
||||
create table t1 (a int not null) type=merge;
|
||||
select * from t1;
|
||||
a
|
||||
drop table t1;
|
||||
drop table if exists t3, t2, t1;
|
||||
create table t1 (a int not null, b int not null, key(a,b));
|
||||
create table t2 (a int not null, b int not null, key(a,b));
|
||||
create table t3 (a int not null, b int not null, key(a,b)) TYPE=MERGE UNION=(t1,t2);
|
||||
insert into t1 values (1,2),(2,1),(0,0),(4,4),(5,5),(6,6);
|
||||
insert into t2 values (1,1),(2,2),(0,0),(4,4),(5,5),(6,6);
|
||||
flush tables;
|
||||
select * from t3 where a=1 order by b limit 2;
|
||||
a b
|
||||
1 1
|
||||
1 2
|
||||
drop table t3,t1,t2;
|
||||
|
||||
Reference in New Issue
Block a user