summaryrefslogtreecommitdiff
path: root/mysql-test/r/sql_mode.result
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-10-09 16:52:02 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-10-09 16:52:02 +0200
commit05f88483fb476c626b26a3fc2e0faca930f7bd7d (patch)
tree21d7e9100311b310bbc8db236b2e03b501136708 /mysql-test/r/sql_mode.result
parentc0221b0e95019ede5753302fac13934aaa55c3ba (diff)
downloadmariadb-git-05f88483fb476c626b26a3fc2e0faca930f7bd7d.tar.gz
Bug #21099 MySQL 5.0.22 silently creates MyISAM tables even though
InnoDB specified. NO_ENGINE_SUBSTITUTION added to TRADITIONAL sql mode to prevent silent conversions from InnoDB to MyISAM in that sql mode. A number of test case results files updated to reflect this change. Test added to sql_mode.test that checks that TRADITIONAL really includes NO_ENGINE_SUBSTITUION. mysql-test/t/ctype_utf8.test: This test lacked "--source include/have_innodb.inc" which meant that a number of DDL statements with engine=innodb in reality were using myisam. "--disable_warnings" around all such statements, meant that these engine substitutions were not visible. Test case has been updated to include have_innodb.inc and "--disable_warnings" have been removed for the relevant DDL statements.
Diffstat (limited to 'mysql-test/r/sql_mode.result')
-rw-r--r--mysql-test/r/sql_mode.result6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index 0b0d5a38d0b..e83879274a1 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -506,6 +506,12 @@ mysqltest_32753@localhost
set session sql_mode=@OLD_SQL_MODE;
flush privileges;
drop user mysqltest_32753@localhost;
+SET @org_mode=@@sql_mode;
+SET @@sql_mode='traditional';
+SELECT @@sql_mode LIKE '%NO_ENGINE_SUBSTITUTION%';
+@@sql_mode LIKE '%NO_ENGINE_SUBSTITUTION%'
+1
+SET sql_mode=@org_mode;
DROP TABLE IF EXISTS t1,t2;
CREATE USER 'user_PCTFL'@'localhost' identified by 'PWD';
CREATE USER 'user_no_PCTFL'@'localhost' identified by 'PWD';