summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqldump.test
diff options
context:
space:
mode:
authorhery.ramilison@oracle.com <>2011-03-16 15:11:20 +0100
committerMySQL Build Team <build@mysql.com>2011-03-16 15:11:20 +0100
commit18d2e55c51525003e2267e06e7de5699f90a80f7 (patch)
tree3b31ba86b07ae94f5ca16e551fc8157d0188b2ab /mysql-test/t/mysqldump.test
parent5aed24509824dae9fb61f4cdc17510707ec314ad (diff)
parenteea75513c22f074c6d7e46f14acf693bcbb0da56 (diff)
downloadmariadb-git-18d2e55c51525003e2267e06e7de5699f90a80f7.tar.gz
Merge from mysql-5.5.10-release
Diffstat (limited to 'mysql-test/t/mysqldump.test')
-rw-r--r--mysql-test/t/mysqldump.test10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 44245eb9d44..5ed66646432 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -2203,5 +2203,15 @@ DROP DATABASE `test-database`;
--echo # End of 5.1 tests
--echo #
+--echo #
+--echo # Verify that two modes can be given in --compatible;
+--echo # and are reflected in SET SQL_MODE in the mysqldump output.
+--echo # Also verify that a prefix of the mode's name is enough.
+--echo #
+CREATE TABLE t1 (a INT);
+# no_t = no_table_options; no_f = no_field_options
+--exec $MYSQL_DUMP --compatible=no_t,no_f --skip-comments test
+DROP TABLE t1;
+
# Wait till we reached the initial number of concurrent sessions
--source include/wait_until_count_sessions.inc