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, 50 insertions, 8 deletions

diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index 2090781caab..3cee343d989 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -1,5 +1,22 @@
+slave stop;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+slave start;
+slave stop;
+reset master;
+reset slave;
+reset master;
+drop table if exists t1;
+create table t1(n int not null auto_increment primary key);
+insert into t1 values (NULL);
+drop table t1;
+create table t1 (word char(20) not null);
+load data infile '../../std_data/words.dat' into table t1;
+drop table t1;
+show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -8,15 +25,23 @@ master-bin.001	311	Query	1	6	use test; create table t1 (word char(20) not null)
 master-bin.001	386	Create_file	1	7	db=test;table=t1;file_id=1;block_len=81
 master-bin.001	556	Exec_load	1	8	;file_id=1
 master-bin.001	579	Query	1	9	use test; drop table t1
+show binlog events from 79 limit 1;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
+show binlog events from 79 limit 2;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
+show binlog events from 79 limit 2,1;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
+flush logs;
+create table t1 (n int);
+insert into t1 values (1);
+drop table t1;
+show binlog events;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.001	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
+master-bin.001	4	Start	1	1	Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2
 master-bin.001	79	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 master-bin.001	172	Intvar	1	3	INSERT_ID=1
 master-bin.001	200	Query	1	4	use test; insert into t1 values (NULL)
@@ -27,20 +52,25 @@ master-bin.001	556	Exec_load	1	8	;file_id=1
 master-bin.001	579	Query	1	9	use test; drop table t1
 master-bin.001	627	Rotate	1	10	master-bin.002;pos=4
 master-bin.001	668	Stop	1	11	
+show binlog events in 'master-bin.002';
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-master-bin.002	4	Start	1	1	Server ver: $VERSION, Binlog ver: 2
+master-bin.002	4	Start	1	1	Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2
 master-bin.002	79	Query	1	2	use test; create table t1 (n int)
 master-bin.002	137	Query	1	3	use test; insert into t1 values (1)
 master-bin.002	197	Query	1	4	use test; drop table t1
+show master logs;
 Log_name
 master-bin.001
 master-bin.002
+slave start;
+show master logs;
 Log_name
 slave-bin.001
 slave-bin.002
+show binlog events in 'slave-bin.001' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.001	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
-slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4
+slave-bin.001	4	Start	2	1	Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2
+slave-bin.001	79	Slave	2	3	host=127.0.0.1,port=9306,log=master-bin.001,pos=4
 slave-bin.001	132	Query	1	2	use test; create table t1(n int not null auto_increment primary key)
 slave-bin.001	225	Intvar	1	3	INSERT_ID=1
 slave-bin.001	253	Query	1	4	use test; insert into t1 values (NULL)
@@ -51,21 +81,33 @@ slave-bin.001	618	Exec_load	1	8	;file_id=1
 slave-bin.001	641	Query	1	9	use test; drop table t1
 slave-bin.001	689	Rotate	1	4	slave-bin.002;pos=4; forced by master
 slave-bin.001	729	Stop	2	5	
+show binlog events in 'slave-bin.002' from 4;
 Log_name	Pos	Event_type	Server_id	Log_seq	Info
-slave-bin.002	4	Start	2	1	Server ver: $VERSION, Binlog ver: 2
-slave-bin.002	79	Slave	2	10	host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4
+slave-bin.002	4	Start	2	1	Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2
+slave-bin.002	79	Slave	2	10	host=127.0.0.1,port=9306,log=master-bin.002,pos=4
 slave-bin.002	132	Query	1	2	use test; create table t1 (n int)
 slave-bin.002	190	Query	1	3	use test; insert into t1 values (1)
 slave-bin.002	250	Query	1	4	use test; drop table t1
+show slave status;
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter	Last_log_seq
-127.0.0.1	root	$MASTER_MYPORT	1	master-bin.002	245	Yes			0		0	4
+127.0.0.1	root	9306	1	master-bin.002	245	Yes			0		0	4
+show new master for slave with master_log_file='master-bin.001' and
+master_log_pos=4 and master_log_seq=1 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	132
+show new master for slave with master_log_file='master-bin.001' and
+master_log_pos=79 and master_log_seq=2 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	225
+show new master for slave with master_log_file='master-bin.001' and
+master_log_pos=311 and master_log_seq=6 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.001	439
+show new master for slave with master_log_file='master-bin.002' and
+master_log_pos=4 and master_log_seq=1 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.002	132
+show new master for slave with master_log_file='master-bin.002' and
+master_log_pos=137 and master_log_seq=3 and master_server_id=1;
 Log_name	Log_pos
 slave-bin.002	250