diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-10-03 14:21:16 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-10-03 14:21:16 -0600 |
commit | 7968bc7f66bf7a641fdda4493252bc8e7c571374 (patch) | |
tree | 228338950ecb3ac05baf2e782fc004a02682b17a /mysql-test/t/rpl000002.test | |
parent | 5a18acf35f208c3cfa9534b337fe31d333615e4f (diff) | |
parent | 83fa1116792e55ddb9dc57276b689a97e6ab8f74 (diff) | |
download | mariadb-git-7968bc7f66bf7a641fdda4493252bc8e7c571374.tar.gz |
merged
client/Makefile.am:
Auto merged
include/my_sys.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
sql/lex.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/t/rpl000002.test')
-rw-r--r-- | mysql-test/t/rpl000002.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/rpl000002.test b/mysql-test/t/rpl000002.test index 865aa5e5bab..5840b1998a8 100644 --- a/mysql-test/t/rpl000002.test +++ b/mysql-test/t/rpl000002.test @@ -11,6 +11,7 @@ use test; sync_with_master; select * from t1; connection master; +--replace_result 9307 9999 3350 9999 3351 9999 show slave hosts; drop table t1; save_master_pos; |