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

1 files changed, 69 insertions, 0 deletions

diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result
index 87ba8961ad6..a28830a696d 100644
--- a/mysql-test/r/null_key.result
+++ b/mysql-test/r/null_key.result
@@ -1,101 +1,164 @@
+drop table if exists t1;
+create table t1 (a int, b int not null,unique key (a,b),index(b)) type=myisam;
+insert ignore into t1 values (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(null,7),(9,9),(8,8),(7,7),(null,9),(null,9),(6,6);
+explain select * from t1 where a is null;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a	a	5	const	3	where used; Using index
+explain select * from t1 where a is null and b = 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	9	const,const	1	where used; Using index
+explain select * from t1 where a is null and b = 7;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	9	const,const	1	where used; Using index
+explain select * from t1 where a=2 and b = 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	const	a,b	a	9	const,const	1	
+explain select * from t1 where a<=>b limit 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	index	NULL	a	9	NULL	12	where used; Using index
+explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a,b	a	9	NULL	3	where used; Using index
+explain select * from t1 where (a is null or a = 7) and b=7;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	b	4	const	2	where used
+explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used; Using index
+explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a,b	a	9	NULL	2	where used; Using index
+explain select * from t1 where a > 1 and a < 3 limit 1;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a	a	5	NULL	1	where used; Using index
+explain select * from t1 where a > 8 and a < 9;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a	a	5	NULL	1	where used; Using index
+select * from t1 where a is null;
 a	b
 NULL	7
 NULL	9
 NULL	9
+select * from t1 where a is null and b = 7;
 a	b
 NULL	7
+select * from t1 where a<=>b limit 2;
 a	b
 1	1
 2	2
+select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
 a	b
 1	1
 2	2
+select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
 a	b
 NULL	9
 NULL	9
+select * from t1 where (a is null or a = 7) and b=7;
 a	b
 NULL	7
 7	7
+select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
 a	b
 NULL	7
 NULL	9
 NULL	9
+alter table t1 modify b blob not null, add c int not null, drop key a, add unique key (a,b(20),c), drop key b, add key (b(10));
+explain select * from t1 where a is null and b = 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used
+explain select * from t1 where a is null and b = 2 and c=0;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used
+explain select * from t1 where a is null and b = 7 and c=0;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used
+explain select * from t1 where a=2 and b = 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	1	where used
+explain select * from t1 where a<=>b limit 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ALL	NULL	NULL	NULL	NULL	12	where used
+explain select * from t1 where (a is null or a > 0 and a < 3) and b < 5 and c=0 limit 3;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a,b	a	5	NULL	5	where used
+explain select * from t1 where (a is null or a = 7) and b=7 and c=0;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a,b	a	5	NULL	4	where used
+explain select * from t1 where (a is null and b>a) or a is null and b=7 limit 2;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used
+explain select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	a,b	a	5	const	3	where used
+explain select * from t1 where a > 1 and a < 3 limit 1;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a	a	5	NULL	1	where used
+explain select * from t1 where a is null and b=7 or a > 1 and a < 3 limit 1;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a,b	a	5	NULL	4	where used
+explain select * from t1 where a > 8 and a < 9;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	a	a	5	NULL	1	where used
+explain select * from t1 where b like "6%";
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	range	b	b	12	NULL	1	where used
+select * from t1 where a is null;
 a	b	c
 NULL	7	0
 NULL	9	0
 NULL	9	0
+select * from t1 where a is null and b = 7 and c=0;
 a	b	c
 NULL	7	0
+select * from t1 where a<=>b limit 2;
 a	b	c
 1	1	0
 2	2	0
+select * from t1 where (a is null or a > 0 and a < 3) and b < 5 limit 3;
 a	b	c
 1	1	0
 2	2	0
+select * from t1 where (a is null or a > 0 and a < 3) and b > 7 limit 3;
 a	b	c
 NULL	9	0
 NULL	9	0
+select * from t1 where (a is null or a = 7) and b=7 and c=0;
 a	b	c
 NULL	7	0
 7	7	0
+select * from t1 where a is null and b=9 or a is null and b=7 limit 3;
 a	b	c
 NULL	7	0
 NULL	9	0
 NULL	9	0
+select * from t1 where b like "6%";
 a	b	c
 6	6	0
+drop table t1;
+DROP TABLE IF EXISTS t1,t2;
+CREATE TABLE t1 (
+id int(10) unsigned NOT NULL auto_increment,
+uniq_id int(10) unsigned default NULL,
+PRIMARY KEY  (id),
+UNIQUE KEY idx1 (uniq_id)
+) TYPE=MyISAM;
+CREATE TABLE t2 (
+id int(10) unsigned NOT NULL auto_increment,
+uniq_id int(10) unsigned default NULL,
+PRIMARY KEY  (id)
+) TYPE=MyISAM;
+INSERT INTO t1 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
+INSERT INTO t2 VALUES (1,NULL),(2,NULL),(3,1),(4,2),(5,NULL),(6,NULL),(7,3),(8,4),(9,NULL),(10,NULL);
+explain select id from t1 where uniq_id is null;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	ref	idx1	idx1	5	const	1	where used
+explain select id from t1 where uniq_id =1;
 table	type	possible_keys	key	key_len	ref	rows	Extra
 t1	const	idx1	idx1	5	const	1	
+UPDATE t1 SET id=id+100 where uniq_id is null;
+UPDATE t2 SET id=id+100 where uniq_id is null;
+select id from t1 where uniq_id is null;
 id
 101
 102
@@ -103,6 +166,7 @@ id
 106
 109
 110
+select id from t2 where uniq_id is null;
 id
 101
 102
@@ -110,13 +174,18 @@ id
 106
 109
 110
+DELETE FROM t1 WHERE uniq_id IS NULL;
+DELETE FROM t2 WHERE uniq_id IS NULL;
+SELECT * FROM t1 ORDER BY uniq_id, id;
 id	uniq_id
 3	1
 4	2
 7	3
 8	4
+SELECT * FROM t2 ORDER BY uniq_id, id;
 id	uniq_id
 3	1
 4	2
 7	3
 8	4
+DROP table t1,t2;