diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-01-18 10:43:09 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-01-18 10:43:09 -0700 |
| commit | c862fa36467651ef3e3cb3acad61e42fc0b3e07c (patch) | |
| tree | cef290a907a4640c4b54eae54d2739caa4d3928a | |
| parent | b86f79e050ce743798fd1e3053c61ee29e6d757f (diff) | |
| download | mariadb-git-c862fa36467651ef3e3cb3acad61e42fc0b3e07c.tar.gz | |
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''
client/mysqltest.c:
merged continued
mysql-test/t/rpl000004.test:
added a test for am empty table
| -rw-r--r-- | client/mysqltest.c | 4 | ||||
| -rw-r--r-- | mysql-test/r/rpl000004.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/rpl000004.test | 10 |
3 files changed, 15 insertions, 5 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 1e84a56d960..5ea4194fc03 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -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),"", diff --git a/mysql-test/r/rpl000004.result b/mysql-test/r/rpl000004.result new file mode 100644 index 00000000000..a1c135a142e --- /dev/null +++ b/mysql-test/r/rpl000004.result @@ -0,0 +1,6 @@ +Table Op Msg_type Msg_text +test.t1 check status OK +count(*) +10 +count(*) +0 diff --git a/mysql-test/t/rpl000004.test b/mysql-test/t/rpl000004.test index 9959c272adb..c530b434d8d 100644 --- a/mysql-test/t/rpl000004.test +++ b/mysql-test/t/rpl000004.test @@ -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; |