Commit 7c731257 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

client/mysqltest.c 

    merged continued
mysql-test/t/rpl000004.test
    added a test for am empty table
mysql-test/r/rpl000004.result
    New BitKeeper file ``mysql-test/r/rpl000004.result''
parent 6dbf423d

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ struct st_query 
	 Q_SLEEP, Q_INC, Q_DEC,Q_SOURCE,

	 Q_DISCONNECT,Q_LET, Q_ECHO, Q_WHILE, Q_END_BLOCK,

	 Q_SYSTEM, Q_RESULT, Q_REQUIRE, Q_SAVE_MASTER_POS,

	 Q_SYNC_WITH_MASTER,

	 Q_SYNC_WITH_MASTER, Q_ERROR,

	 Q_UNKNOWN, Q_COMMENT, Q_COMMENT_WITH_COMMAND} type;

};



const char *command_names[] = {

"connection", "query","connect","sleep","inc","dec","source","disconnect",

"let","echo","while","end","system","result", "require", "save_master_pos",

 "sync_with_master", 0

 "sync_with_master", "error", 0

};



TYPELIB command_typelib= {array_elements(command_names),"",

mysql-test/r/rpl000004.result

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

count(*)

10

count(*)

0

mysql-test/t/rpl000004.test

+7 −3
Original line number Diff line number Diff line
@@ -8,17 +8,21 @@ load data infile '../../std_data/words.dat' into table t1; 
drop table if exists t2;

create table t2 (word char(20) not null);

load data infile '../../std_data/words.dat' into table t2;

create table t3 (word char(20) not null);

connection slave;

use test;

drop table if exists t1;

load table t1 from master;

drop table if exists t2;

load table t2 from master;

@r/rpl000004.a.result check table t1;

@r/rpl000004.b.result select count(*) from t2;

drop table if exists t3;

load table t3 from master;

check table t1;

select count(*) from t2;

select count(*) from t3;

connection master;

set SQL_LOG_BIN=1;

drop table if exists t1,t2;

drop table if exists t1,t2,t3;

save_master_pos;

connection slave;

sync_with_master;