diff options
| author | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-06 13:42:26 +0300 |
| commit | 445148f08339db0cc32c5254f31f8629fedd2af0 (patch) | |
| tree | 9a75e17ac46c0c2c536c9050f133f4319e09c69e /mysql-test | |
| parent | cc7a8d9bed2193dc3d424b19cac456477db6e6f5 (diff) | |
| parent | 2d776e36d8dd205efccc18a75292308fd4c5d385 (diff) | |
| download | mariadb-git-445148f08339db0cc32c5254f31f8629fedd2af0.tar.gz | |
Merge with 4.0 to get security patch for check_grant_colum
innobase/include/os0file.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
mysql-test/r/rpl_server_id2.result:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/slave.cc:
Merge with 4.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_server_id2.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_server_id2.test | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index d8d805fc0d2..fde7251497a 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -20,4 +20,5 @@ select * from t1; n 1 1 +stop slave; drop table t1; diff --git a/mysql-test/t/rpl_server_id2.test b/mysql-test/t/rpl_server_id2.test index f022ab13188..dc8f733b7ed 100644 --- a/mysql-test/t/rpl_server_id2.test +++ b/mysql-test/t/rpl_server_id2.test @@ -18,4 +18,8 @@ insert into t1 values (1); save_master_pos; sync_with_master; select * from t1; # check that indeed 2 were inserted +# We stop the slave before cleaning up otherwise we'll get +# 'drop table t1' executed twice, so an error in the slave.err +# (not critical). +stop slave; drop table t1; |