diff options
| author | unknown <msvensson@pilot.(none)> | 2007-06-01 15:43:04 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-06-01 15:43:04 +0200 |
| commit | c73e0cfb6022945a5b0411b740f51e0f931a9d07 (patch) | |
| tree | 82b8f2aeabc56af2d35ef10d252b2d931791dfd5 /mysql-test/t/mysqltest.test | |
| parent | 7816d02ef7fb4414c5ff9b9654c6e0468c9b2c66 (diff) | |
| parent | 7ff06317a44b700226a64ae5a0f2ab5d2433b9a0 (diff) | |
| download | mariadb-git-c73e0cfb6022945a5b0411b740f51e0f931a9d07.tar.gz | |
Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
Diffstat (limited to 'mysql-test/t/mysqltest.test')
| -rw-r--r-- | mysql-test/t/mysqltest.test | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 42541dea226..2b2f1348417 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1227,11 +1227,9 @@ select "a" as col1, "c" as col2; # Test sync_with_master # ---------------------------------------------------------------------------- --error 1 ---exec echo "save_master_pos; sync_with_master 10!;" | $MYSQL_TEST 2>&1 +--exec echo "sync_with_master 10!;" | $MYSQL_TEST 2>&1 --error 1 ---exec echo "save_master_pos; sync_with_master 10 !;" | $MYSQL_TEST 2>&1 ---error 1 ---exec echo "save_master_pos; sync_with_master a;" | $MYSQL_TEST 2>&1 +--exec echo "sync_with_master a;" | $MYSQL_TEST 2>&1 # ---------------------------------------------------------------------------- # Test connect |