diff options
| author | unknown <Kristofer.Pettersson@naruto.> | 2007-04-07 21:03:35 +0200 |
|---|---|---|
| committer | unknown <Kristofer.Pettersson@naruto.> | 2007-04-07 21:03:35 +0200 |
| commit | d4744eb9dda6deb09c6c90c8beb0e0390f7ce568 (patch) | |
| tree | ede5de601db707510c53f9ed0d7d96918c2e51c8 /mysql-test/t/mysqldump.test | |
| parent | be3bc128abb09641f0d03216101c4d6938af4245 (diff) | |
| parent | 393e2aa9d5bbaad68c5c2624a714b1553dfb2075 (diff) | |
| download | mariadb-git-d4744eb9dda6deb09c6c90c8beb0e0390f7ce568.tar.gz | |
Merge naruto.:C:/cpp/bug26121/my51-bug26121
into naruto.:C:/cpp/mysql-5.1-runtime
mysql-test/t/mysqldump.test:
Auto merged
client/mysqldump.c:
manual merge
Diffstat (limited to 'mysql-test/t/mysqldump.test')
| -rw-r--r-- | mysql-test/t/mysqldump.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 49adda73f2d..ba19fa30663 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -1612,6 +1612,13 @@ drop view v1; drop table t1; drop database mysqldump_test_db; +# +# BUG#26121 mysqldump includes LOCK TABLES general_log WRITE +# +--exec $MYSQL_DUMP --all-databases > $MYSQLTEST_VARDIR/tmp/bug26121.sql +--exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug26121.sql +--remove_file $MYSQLTEST_VARDIR/tmp/bug26121.sql + --echo # --echo # End of 5.1 tests --echo # |