MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be...

MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)

mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc

@@ -16,6 +16,7 @@
 #
 
 --source include/have_log_bin.inc
+set sql_mode="";
 
 SET NAMES 'utf8';
 #SHOW VARIABLES LIKE 'character_set%';

mysql-test/extra/rpl_tests/rpl_ddl.test

@@ -128,6 +128,8 @@
 ###############################################################
 # Some preparations
 ###############################################################
+set global sql_mode='';
+set local sql_mode='';
 # The sync_slave_with_master is needed to make the xids deterministic.
 sync_slave_with_master;
 
@@ -609,3 +611,5 @@ DROP TEMPORARY TABLE mysqltest1.t22;
 DROP DATABASE mysqltest1;
 # mysqltest2 was alreday DROPPED some tests before.
 DROP DATABASE mysqltest3;
+
+set global sql_mode=default;

mysql-test/include/concurrent.inc

@@ -26,6 +26,7 @@
 #
 
 connection default;
+SET SQL_MODE="";
 #
 # Show prerequisites for this test.
 #
@@ -670,3 +671,4 @@ connection default;
 drop table t1;
 drop user mysqltest@localhost;
 
+SET SQL_MODE=default;

mysql-test/include/ctype_innodb_like.inc

@@ -2,6 +2,10 @@
 # Bug#11650: LIKE pattern matching using prefix index
 # doesn't return correct result
 #
+--disable_query_log
+set @ctype_save_sql_mode=@@sql_mode;
+set sql_mode="";
+--enable_query_log
 --disable_warnings
 #
 # This query creates a column using
@@ -10,6 +14,9 @@
 #
 create table t1 engine=innodb select repeat('a',50) as c1;
 --enable_warnings
+--disable_query_log
+set sql_mode=@ctype_save_sql_mode;
+--enable_query_log
 alter table t1 add index(c1(5));
 
 insert into t1 values ('abcdefg'),('abcde100'),('abcde110'),('abcde111');

mysql-test/include/ctype_utf8mb4.inc

@@ -688,9 +688,16 @@ eval create table t1 (
 insert into t1 values(1,'foo'),(2,'foobar');
 --sorted_result
 select * from t1 where b like 'foob%';
+--disable_query_log
+set @ctype_save_sql_mode=@@sql_mode;
+set sql_mode="";
+--enable_query_log
 --disable_warnings
 alter table t1 engine=innodb;
 --enable_warnings
+--disable_query_log
+set sql_mode=@ctype_save_sql_mode;
+--enable_query_log
 --sorted_result
 select * from t1 where b like 'foob%';
 drop table t1;

mysql-test/include/explain_non_select.inc

@@ -771,7 +771,7 @@ DROP TABLE t1,t2;
 
 --echo #74
 
-CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
+CREATE TABLE t1(a INT PRIMARY KEY);
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
 
 --echo # used key is modified & Using temporary

mysql-test/include/grant_cache.inc

@@ -37,12 +37,16 @@
 
 --source include/add_anonymous_users.inc
 
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 #
 --disable_warnings
 drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
 --enable_warnings
 
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 
 reset query cache;
@@ -214,5 +218,9 @@ drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;
 
 set GLOBAL query_cache_size=default;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 
 --source include/delete_anonymous_users.inc
+set GLOBAL sql_mode=default;
+set GLOBAL query_cache_type=default;

mysql-test/include/icp_tests.inc

@@ -443,13 +443,13 @@ DROP TABLE t1;
 --echo #            when ICP is on"
 --echo #
 
-CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 
 INSERT INTO t1 VALUES (11,0);
 INSERT INTO t1 VALUES (12,5);
 INSERT INTO t1 VALUES (15,0);
 
-CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 
 INSERT INTO t2 VALUES (11,1);
 INSERT INTO t2 VALUES (12,2);

mysql-test/include/query_cache.inc

@@ -15,6 +15,8 @@
 #               main code went into include/query_cache.inc
 #
 
+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 eval SET SESSION STORAGE_ENGINE = $engine_type;
 
 # Initialise
@@ -193,3 +195,5 @@ disconnect connection1;
 connection default;
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+
+SET global query_cache_type=default;

mysql-test/include/query_cache_partitions.inc

@@ -4,6 +4,8 @@
 #     $engine_type       -- storage engine to be tested
 # have to be set before sourcing this script.
 
+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 eval SET SESSION STORAGE_ENGINE = $engine_type;
 
 # Initialise
@@ -124,3 +126,4 @@ show status like "Qcache_hits";
 drop table t1;
 
 set @@global.query_cache_size = @save_query_cache_size;
+SET global query_cache_type=default;

mysql-test/include/query_cache_sql_prepare.inc

@@ -20,6 +20,8 @@
 --source include/have_query_cache.inc
 # embedded can't make more than one connection, which this test needs
 -- source include/not_embedded.inc
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 
 --echo ---- establish connection con1 (root) ----
 connect (con1,localhost,root,,test,$MASTER_MYPORT,);
@@ -528,3 +530,4 @@ drop table t1;
 
 set @@global.query_cache_size=@initial_query_cache_size;
 flush status; # reset Qcache status variables for next tests
+set GLOBAL query_cache_type=default;

mysql-test/r/analyze_format_json.result

@@ -143,7 +143,7 @@ ANALYZE
         "attached_condition": "(tbl2.b < 60)"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "r_filtered": 100
     }
@@ -181,7 +181,7 @@ ANALYZE
         "attached_condition": "(tbl2.b < 60)"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "attached_condition": "(tbl1.c > tbl2.c)",
       "r_filtered": 15.833

mysql-test/r/analyze_stmt_orderby.result

@@ -422,7 +422,7 @@ ANALYZE
             "r_filtered": 100
           },
           "buffer_type": "flat",
-          "buffer_size": "128Kb",
+          "buffer_size": "256Kb",
           "join_type": "BNL",
           "attached_condition": "(t3.a = t0.a)",
           "r_filtered": 10
@@ -491,7 +491,7 @@ ANALYZE
                 "r_filtered": 100
               },
               "buffer_type": "flat",
-              "buffer_size": "128Kb",
+              "buffer_size": "256Kb",
               "join_type": "BNL",
               "attached_condition": "(t5.a = t6.a)",
               "r_filtered": 21.429
@@ -528,7 +528,7 @@ EXPLAIN
             "filtered": 100
           },
           "buffer_type": "flat",
-          "buffer_size": "128Kb",
+          "buffer_size": "256Kb",
           "join_type": "BNL",
           "attached_condition": "(t5.a = t6.a)"
         }

mysql-test/r/analyze_stmt_privileges.result

@@ -7,6 +7,7 @@ use db;
 create table t1 (i int, c varchar(8));
 insert into t1 values (1,'foo'),(2,'bar'),(3,'baz'),(4,'qux');
 create view v1 as select * from t1 where i > 1;
+CREATE USER u1@localhost;
 grant ALL on db.v1 to u1@localhost;
 connect  con1,localhost,u1,,;
 select * from db.t1;

mysql-test/r/analyze_stmt_privileges2.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 CREATE DATABASE privtest_db;
 CREATE TABLE privtest_db.t1 (a INT, b VARCHAR(3)) ENGINE=MyISAM;
 CREATE TABLE privtest_db.t2 (a INT, b VARCHAR(3)) ENGINE=MyISAM;
@@ -5232,3 +5234,4 @@ connection default;
 DROP USER 'privtest'@localhost;
 USE test;
 DROP DATABASE privtest_db;
+set GLOBAL sql_mode=default;

mysql-test/r/blackhole_plugin.result

+set sql_mode="";
 CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
 Warnings:
 Warning	1286	Unknown storage engine 'BLACKHOLE'
 Warning	1266	Using storage engine MyISAM for table 't1'
+set sql_mode=default;
 DROP TABLE t1;
 INSTALL PLUGIN blackhole SONAME 'ha_blackhole.so';
 INSTALL PLUGIN BLACKHOLE SONAME 'ha_blackhole.so';

mysql-test/r/cache_innodb.result

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 SET SESSION STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3;
 set @save_query_cache_size = @@global.query_cache_size;
@@ -221,6 +223,7 @@ Variable_name	Value
 Qcache_hits	1
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+SET global query_cache_type=default;
 CREATE TABLE t1 (a INT) ENGINE=InnoDB;
 BEGIN;
 INSERT INTO t1 VALUES(1);

mysql-test/r/change_user.result

+set global secure_auth=0;
+create user test_nopw;
 grant select on test.* to test_nopw;
-grant select on test.* to test_oldpw identified by password "09301740536db389";
-grant select on test.* to test_newpw identified by "newpw";
+create user test_oldpw identified by password "09301740536db389";
+grant select on test.* to test_oldpw;
+create user test_newpw identified by "newpw";
+grant select on test.* to test_newpw;
 select concat('<', user(), '>'), concat('<', current_user(), '>'), database();
 concat('<', user(), '>')	concat('<', current_user(), '>')	database()
 <root@localhost>	<root@localhost>	test
@@ -85,3 +89,4 @@ IS_USED_LOCK('bug31418')
 NULL
 FLUSH STATUS;
 Value of com_select did not change
+set global secure_auth=default;

mysql-test/r/compound.result

@@ -155,7 +155,7 @@ drop function fn|
 drop table t1|
 begin not atomic select @@sql_mode; end|
 @@sql_mode
-
+NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 create table t1 (a int)|
 select a from t1 having a > 1|
 a

mysql-test/r/concurrent_innodb_safelog.result

 SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+SET SQL_MODE="";
 SELECT @@global.tx_isolation;
 @@global.tx_isolation
 REPEATABLE-READ
@@ -790,3 +791,4 @@ eta	tipo	c
 ** connection default
 drop table t1;
 drop user mysqltest@localhost;
+SET SQL_MODE=default;

mysql-test/r/concurrent_innodb_unsafelog.result

 SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+SET SQL_MODE="";
 SELECT @@global.tx_isolation;
 @@global.tx_isolation
 REPEATABLE-READ
@@ -786,3 +787,4 @@ eta	tipo	c
 ** connection default
 drop table t1;
 drop user mysqltest@localhost;
+SET SQL_MODE=default;

mysql-test/r/connect.result

+SET global secure_auth=0;
 drop table if exists t1,t2;
 show tables;
 Tables_in_mysql
@@ -143,6 +144,7 @@ drop table t1;
 # -- Bug#33507: Event scheduler creates more threads than max_connections
 # -- which results in user lockout.
 
+CREATE USER mysqltest_u1@localhost;
 GRANT USAGE ON *.* TO mysqltest_u1@localhost;
 
 SET GLOBAL max_connections = 3;
@@ -313,3 +315,4 @@ test
 test
 test
 drop procedure p1;
+SET global secure_auth=default;

mysql-test/r/create_drop_function.result

@@ -4,7 +4,7 @@ RETURNS CHAR(100)
 RETURN CONCAT('Hello, ', str, '!');
 SELECT * FROM mysql.proc WHERE name like 'f1';
 db	name	type	specific_name	language	sql_data_access	is_deterministic	security_type	param_list	returns	body	definer	created	modified	sql_mode	comment	character_set_client	collation_connection	db_collation	body_utf8
-test	f1	FUNCTION	f1	SQL	CONTAINS_SQL	NO	DEFINER	str char(20)	char(100) CHARSET latin1	RETURN CONCAT('Hello, ', str, '!')	root@localhost	2014-09-30 08:00:00	2014-09-30 08:00:00			latin1	latin1_swedish_ci	latin1_swedish_ci	RETURN CONCAT('Hello, ', str, '!')
+test	f1	FUNCTION	f1	SQL	CONTAINS_SQL	NO	DEFINER	str char(20)	char(100) CHARSET latin1	RETURN CONCAT('Hello, ', str, '!')	root@localhost	2014-09-30 08:00:00	2014-09-30 08:00:00	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION		latin1	latin1_swedish_ci	latin1_swedish_ci	RETURN CONCAT('Hello, ', str, '!')
 SELECT f1('world');
 f1('world')
 Hello, world!

mysql-test/r/create_or_replace_permission.result

+set local sql_mode="";
+set global sql_mode="";
 #
 # Tests for checking permission denied on CREATE OR REPLACE if DROP
 # access is revoked
@@ -48,3 +50,4 @@ Warnings:
 Note	1008	Can't drop database 'db2'; database doesn't exist
 DROP DATABASE db1;
 DROP USER mysqltest_1@localhost;
+set global sql_mode=default;

mysql-test/r/ctype_latin2_ch.result

@@ -333,6 +333,7 @@ Y
 z
 Z
 DROP TABLE t1;
+set sql_mode="";
 CREATE TABLE t1 ENGINE=INNODB AS SELECT repeat('a', 5) AS s1 LIMIT 0;
 INSERT INTO t1 VALUES ('x'),('y'),('z'),('X'),('Y'),('Z');
 SELECT * FROM t1 GROUP BY s1;

mysql-test/r/ctype_ucs.result

@@ -1184,7 +1184,9 @@ hex(a)
 005B
 803D
 drop table t1;
+set sql_mode="";
 create table t1(f1 varchar(5) CHARACTER SET ucs2 COLLATE ucs2_bin NOT NULL) engine=InnoDB;
+set sql_mode=default;
 insert into t1 values('a');
 create index t1f1 on t1(f1);
 select f1 from t1 where f1 like 'a%';

mysql-test/r/ctype_ujis.result

@@ -126,6 +126,7 @@ Field	Type	Null	Key	Default	Extra
 a	char(1)	NO			
 b	enum('','')	YES		NULL	
 DROP TABLE t1;
+set sql_mode="";
 CREATE TABLE t1
 (
 a INTEGER NOT NULL,
@@ -133,6 +134,7 @@ b VARCHAR(50) NOT NULL DEFAULT '',
 PRIMARY KEY  (a),
 KEY b (b(10))
 ) ENGINE=InnoDB CHARACTER SET 'ujis' COLLATE 'ujis_japanese_ci';
+set sql_mode=default;
 INSERT INTO t1 (a, b) VALUES (0, 'aaabbbcccddd');
 INSERT INTO t1 (a, b) VALUES (1, 'eeefffggghhh');
 INSERT INTO t1 (a, b) VALUES (2, 'iiijjjkkkl');

mysql-test/r/ctype_utf16.result

@@ -1549,7 +1549,7 @@ SELECT space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second));
 space(date_add(101, INTERVAL CHAR('1' USING utf16) hour_second))
 NULL
 Warnings:
-Warning	1301	Result of space() was larger than max_allowed_packet (1048576) - truncated
+Warning	1301	Result of space() was larger than max_allowed_packet (4194304) - truncated
 #
 # Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT
 #

mysql-test/r/ddl_i18n_koi8r.result

+set sql_mode="";
 set names koi8r;
 
 -------------------------------------------------------------------

mysql-test/r/ddl_i18n_utf8.result

+set sql_mode="";
 set names utf8;
 
 -------------------------------------------------------------------

mysql-test/r/default.result

 drop table if exists t1,t2,t3,t4,t5,t6;
 drop database if exists mysqltest;
+set sql_mode="";
 CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
 b varchar(1) binary NOT NULL DEFAULT ' ',
 c varchar(4) binary NOT NULL DEFAULT '0000',
@@ -29,6 +30,7 @@ z varchar(20) binary NOT NULL DEFAULT ' ',
 a1 varchar(30) binary NOT NULL DEFAULT ' ',
 b1 tinyblob NULL)
 ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+set sql_mode=default;
 INSERT into t1 (b) values ('1');
 SHOW WARNINGS;
 Level	Code	Message

mysql-test/r/delete_returning_grant.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 CREATE TABLE t1 (a int(11), b varchar(32));
 INSERT INTO t1 VALUES (7,'ggggggg'),(1,'a'),(3,'ccc'),(4,'dddd'),(1,'A'),
 (2,'BB'),(4,'DDDD'),(5,'EEEEE'),(7,'GGGGGGG'),(2,'bb');
@@ -67,3 +69,4 @@ DROP DATABASE mysqltest;
 DROP USER mysqltest_1@localhost;
 DROP VIEW v1;
 DROP TABLE t1;
+set GLOBAL sql_mode=default;

mysql-test/r/derived_view.result

@@ -2262,10 +2262,7 @@ CREATE TABLE IF NOT EXISTS `galleries` (
 `year` int(11) DEFAULT NULL, 
 PRIMARY KEY (`id`), 
 UNIQUE KEY `name` (`name`) 
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 'galleries'
+) DEFAULT CHARSET=utf8;
 CREATE TABLE IF NOT EXISTS `pictures` ( 
 `id` int(11) NOT NULL AUTO_INCREMENT, 
 `name` varchar(100) NOT NULL, 
@@ -2278,10 +2275,7 @@ CREATE TABLE IF NOT EXISTS `pictures` (
 `type` int(11) NOT NULL, 
 PRIMARY KEY (`id`), 
 KEY `gallery_id` (`gallery_id`) 
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 ;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 'pictures'
+) DEFAULT CHARSET=utf8 ;
 ALTER TABLE `pictures` 
 ADD CONSTRAINT `pictures_ibfk_1` FOREIGN KEY (`gallery_id`) REFERENCES `galleries` (`id`);
 INSERT INTO `galleries` (`id`, `name`, `year`) VALUES 

mysql-test/r/enforce_storage_engine.result

+set local sql_mode="";
+set global sql_mode="";
 drop table if exists t1;
 SET SESSION enforce_storage_engine=MyISAM;
 select @@session.enforce_storage_engine;
@@ -117,5 +119,6 @@ t1	CREATE TABLE `t1` (
   PRIMARY KEY (`c1`)
 ) ENGINE=MEMORY DEFAULT CHARSET=latin1
 DROP TABLE t1;
+set global sql_mode=default;
 SET SESSION enforce_storage_engine=NULL;
 SET GLOBAL enforce_storage_engine=NULL;

mysql-test/r/enforce_storage_engine_opt.result

+SET SQL_MODE="";
 create table t1 (c1 int primary key auto_increment, c2 varchar(10)) engine=memory;
 Warnings:
 Note	1266	Using storage engine MyISAM for table 't1'

mysql-test/r/events_1.result

+set sql_mode="";
 call mtr.add_suppression("Column count of mysql.event is wrong. Expected .*, found .*\. The table is probably corrupted");
 drop database if exists events_test;
 drop database if exists db_x;

mysql-test/r/events_2.result

+set sql_mode="";
 drop database if exists events_test;
 create database events_test;
 use events_test;

mysql-test/r/events_bugs.result

+SET SQL_MODE="";
 drop database if exists events_test;
 drop database if exists mysqltest_db1;
 drop database if exists mysqltest_db2;

mysql-test/r/events_trans.result

+set sql_mode="";
 drop database if exists events_test;
 drop database if exists mysqltest_no_such_database;
 create database events_test;

mysql-test/r/events_trans_notembedded.result

@@ -2,6 +2,7 @@ drop database if exists events_test;
 drop database if exists mysqltest_db2;
 create database events_test;
 use events_test;
+create user mysqltest_user1@localhost;
 grant create, insert, select, delete on mysqltest_db2.*
 to mysqltest_user1@localhost;
 create database mysqltest_db2;

mysql-test/r/explain_json.result

@@ -371,7 +371,7 @@ EXPLAIN
         "attached_condition": "(tbl2.b < 5)"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "attached_condition": "(tbl2.a = tbl1.a)"
     }
@@ -638,7 +638,7 @@ EXPLAIN
         "filtered": 100
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL"
     }
   }
@@ -672,7 +672,7 @@ EXPLAIN
         "first_match": "t2"
       },
       "buffer_type": "flat",
-      "buffer_size": "128Kb",
+      "buffer_size": "256Kb",
       "join_type": "BNL",
       "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
     }
@@ -709,7 +709,7 @@ EXPLAIN
           "filtered": 100
         },
         "buffer_type": "flat",
-        "buffer_size": "128Kb",
+        "buffer_size": "256Kb",
         "join_type": "BNL",
         "attached_condition": "((t1.b = t2.b) and (t1.a = t2.a))"
       }
@@ -822,7 +822,7 @@ EXPLAIN
               "filtered": 100
             },
             "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
             "join_type": "BNL",
             "attached_condition": "((t2.b <> outer_t1.a) and trigcond(((<cache>(outer_t1.a) = t1.a) or isnull(t1.a))))"
           }
@@ -873,7 +873,7 @@ EXPLAIN
               "filtered": 100
             },
             "buffer_type": "flat",
-            "buffer_size": "128Kb",
+            "buffer_size": "256Kb",
             "join_type": "BNL",
             "attached_condition": "(tbl2.b = tbl1.b)"
           }

mysql-test/r/features.result

 drop table if exists t1;
+set sql_mode="";
 flush status;
 show status like "feature%";
 Variable_name	Value

mysql-test/r/fix_priv_tables.result

 drop table if exists t1,t1aa,t2aa;
+set sql_mode="";
 DROP DATABASE IF EXISTS testdb;
 CREATE DATABASE testdb;
 CREATE TABLE testdb.t1 (

mysql-test/r/flush-innodb-notembedded.result

+set sql_mode="";
 # Test 7: Check privileges required.
 #
 CREATE DATABASE db1;

mysql-test/r/flush_read_lock.result

+set global sql_mode="";
+set local sql_mode="";
 # FTWRL takes two global metadata locks -- a global shared
 # metadata lock and the commit blocker lock.
 # The first lock prevents DDL from taking place.
@@ -1667,3 +1669,4 @@ drop database `#mysql50#mysqltest-2`;
 drop database mysqltest1;
 drop temporary tables t1_temp, t2_temp;
 drop tables t1_base, t2_base, t3_trans;
+set global sql_mode=default;

mysql-test/r/func_compress.result

+set global max_allowed_packet=1048576;
 select @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ';
 @test_compress_string:='string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa '
 string for test compress function aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 
@@ -152,6 +153,7 @@ UNCOMPRESS(CAST(0 AS BINARY(5)))
 NULL
 Warnings:
 Warning	1259	ZLIB: Input data corrupted
+set global max_allowed_packet=default;
 #
 # End of 5.5 tests
 #

mysql-test/r/func_math.result

@@ -214,7 +214,9 @@ CAST(RAND(2) * 1000 AS UNSIGNED)	CAST(RAND(?) * 1000 AS UNSIGNED)
 122	122
 645	645
 DROP TABLE t1;
+set sql_mode="";
 create table t1 (a varchar(90), ts datetime not null, index (a)) engine=innodb default charset=utf8;
+set sql_mode=default;
 insert into t1 values ('http://www.foo.com/', now());
 select a from t1 where a='http://www.foo.com/' order by abs(timediff(ts, 0));
 a

mysql-test/r/func_misc.result

@@ -334,10 +334,7 @@ CREATE TABLE t1 (a char(2) not null );
 INSERT INTO t1 VALUES (4),(7),(1);
 set @optimizer_switch_save= @@optimizer_switch;
 set optimizer_switch='materialization=off';
-CREATE TABLE tv (e char(2) not null ) engine=mysql;
-Warnings:
-Warning	1286	Unknown storage engine 'mysql'
-Warning	1266	Using storage engine MyISAM for table 'tv'
+CREATE TABLE tv (e char(2) not null );
 INSERT INTO tv VALUES (1);
 CREATE ALGORITHM=MERGE VIEW v_merge AS SELECT * FROM tv;
 CREATE ALGORITHM=MERGE VIEW vm AS SELECT * FROM tv;

mysql-test/r/func_str.result

 drop table if exists t1,t2;
+set global max_allowed_packet=1048576;
 set names latin1;
 select 'hello',"'hello'",'""hello""','''h''e''l''l''o''',"hel""lo",'hel\'lo';
 hello	'hello'	""hello""	'h'e'l'l'o'	hel"lo	hel'lo
@@ -4530,6 +4531,7 @@ SET NAMES latin2;
 EXECUTE stmt;
 COLLATION(space(2))
 latin2_general_ci
+set global max_allowed_packet=default;
 #
 # End of 5.6 tests
 #

mysql-test/r/func_weight_string.result

 drop table if exists t1;
+set global max_allowed_packet=1048576;
 set names latin1;
 select hex(weight_string(0x010203));
 hex(weight_string(0x010203))
@@ -90,3 +91,4 @@ NULL
 Warnings:
 Warning	1301	Result of cast_as_binary() was larger than max_allowed_packet (1048576) - truncated
 Warning	1301	Result of weight_string() was larger than max_allowed_packet (1048576) - truncated
+set global max_allowed_packet=default;

mysql-test/r/gis.result

@@ -809,7 +809,7 @@ drop procedure if exists fn3;
 create function fn3 () returns point deterministic return GeomFromText("point(1 1)");
 show create function fn3;
 Function	sql_mode	Create Function	character_set_client	collation_connection	Database Collation
-fn3		CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point
+fn3	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` FUNCTION `fn3`() RETURNS point
     DETERMINISTIC
 return GeomFromText("point(1 1)")	latin1	latin1_swedish_ci	latin1_swedish_ci
 select astext(fn3());

mysql-test/r/grant.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 SET @old_log_bin_trust_function_creators= @@global.log_bin_trust_function_creators;
 SET GLOBAL log_bin_trust_function_creators = 1;
 drop table if exists t1;
@@ -2580,3 +2582,4 @@ Grants for mysqltest_u1@%
 GRANT USAGE ON *.* TO 'mysqltest_u1'@'%'
 drop database mysqltest_db1;
 drop user mysqltest_u1;
+set GLOBAL sql_mode=default;

mysql-test/r/grant2.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 SET NAMES binary;
 drop database if exists mysqltest;
 drop database if exists mysqltest_1;
@@ -845,3 +847,4 @@ DROP USER mysqltest_u2@localhost;
 DROP USER mysqltest_u3@localhost;
 DROP USER mysqltest_u4@localhost;
 DROP USER mysqltest_u5@localhost;
+set GLOBAL sql_mode=default;

mysql-test/r/grant3.result

+set global sql_mode="";
+set local sql_mode="";
 SET NAMES binary;
 drop table if exists t1;
 delete from mysql.user where user like 'mysqltest\_%';
@@ -177,4 +179,5 @@ SELECT b FROM temp.t1;
 ERROR 42000: SELECT command denied to user 'user2'@'localhost' for column 'b' in table 't1'
 DROP USER 'user2'@'%';
 DROP DATABASE temp;
+set global sql_mode=default;
 End of 5.0 tests

mysql-test/r/grant4.result

 drop database if exists mysqltest_db1;
+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 create database mysqltest_db1;
 use mysqltest_db1;
 create table t_column_priv_only (a int, b int);
@@ -212,3 +214,4 @@ create user foo3 identified via mysql_old_password using '00';
 ERROR HY000: Password hash should be a 16-digit hexadecimal number
 create user foo4 identified via mysql_old_password using '11111111111111111111111111111111111111111';
 ERROR HY000: Password hash should be a 16-digit hexadecimal number
+set GLOBAL sql_mode=default;

mysql-test/r/grant_4332.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 alter table mysql.user modify User char(16) binary not null default '';
 alter table mysql.db modify User char(16) binary not null default '';
 alter table mysql.tables_priv modify User char(16) binary not null default '';
@@ -30,3 +32,4 @@ Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is
 def					user()	253	141	14	N	1	31	8
 user()
 root@localhost
+set GLOBAL sql_mode=default;

mysql-test/r/grant_cache_no_prot.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 reset query cache;
 flush status;
@@ -219,3 +223,7 @@ flush privileges;
 drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;
 set GLOBAL query_cache_size=default;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
+set GLOBAL sql_mode=default;
+set GLOBAL query_cache_type=default;

mysql-test/r/grant_cache_ps_prot.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
 drop database if exists mysqltest;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 set GLOBAL query_cache_size=1355776;
 reset query cache;
 flush status;
@@ -219,3 +223,7 @@ flush privileges;
 drop table test.t1,mysqltest.t1,mysqltest.t2;
 drop database mysqltest;
 set GLOBAL query_cache_size=default;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
+set GLOBAL sql_mode=default;
+set GLOBAL query_cache_type=default;

mysql-test/r/grant_explain_non_select.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 CREATE DATABASE privtest_db;
 CREATE TABLE privtest_db.t1 (a INT);
 CREATE TABLE privtest_db.t2 (a INT);
@@ -176,3 +178,5 @@ DELETE FROM v1 USING v1, t2 WHERE v1.a = t2.a;
 DROP USER 'privtest'@localhost;
 USE test;
 DROP DATABASE privtest_db;
+set GLOBAL sql_mode=default;
+set LOCAL sql_mode=default;

mysql-test/r/grant_lowercase.result

+set sql_mode="";
 grant file on *.* to user1@localhost with grant option;
 grant select on `a%`.* to user1@localhost with grant option;
 grant file on aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.* to 'user'@'%' identified by 'secret';

mysql-test/r/help.result

@@ -148,10 +148,12 @@ help 'impossible_category_1';
 source_category_name	name	is_it_category
 impossible_category_1	impossible_function_1	N
 impossible_category_1	impossible_function_2	N
+set sql_mode="";
 alter table mysql.help_relation engine=innodb;
 alter table mysql.help_keyword engine=innodb;
 alter table mysql.help_topic engine=innodb;
 alter table mysql.help_category engine=innodb;
+set sql_mode=default;
 help 'function_of_my_dream';
 name	is_it_category
 help '%possible_f%';

mysql-test/r/host_cache_size_functionality.result

@@ -6,7 +6,7 @@ echo '##'
 ####################################################################
 SELECT COUNT(@@GLOBAL.Host_Cache_Size)
 1 Expected
-set @Default_host_cache_size=128;
+set @Default_host_cache_size=279;
 select @@global.Host_Cache_Size=@Default_host_cache_size;
 @@global.Host_Cache_Size=@Default_host_cache_size
 1

mysql-test/r/implicit_commit.result

+SET SQL_MODE="";
 SET GLOBAL EVENT_SCHEDULER = OFF;
 SET BINLOG_FORMAT = STATEMENT;
 CREATE DATABASE db1;

mysql-test/r/index_intersect.result

@@ -1013,10 +1013,7 @@ f4 varchar(32),
 f5 int,
 PRIMARY KEY (f1),
 KEY (f4)
-) ENGINE=InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
+);
 INSERT INTO t1 VALUES 
 (5,'H',1), (9,'g',0), (527,'i',0), (528,'y',1), (529,'S',6),
 (530,'m',7), (531,'b',2), (532,'N',1), (533,'V',NULL), (534,'l',1),

mysql-test/r/index_intersect_innodb.result

@@ -1014,7 +1014,7 @@ f4 varchar(32),
 f5 int,
 PRIMARY KEY (f1),
 KEY (f4)
-) ENGINE=InnoDB;
+);
 INSERT INTO t1 VALUES 
 (5,'H',1), (9,'g',0), (527,'i',0), (528,'y',1), (529,'S',6),
 (530,'m',7), (531,'b',2), (532,'N',1), (533,'V',NULL), (534,'l',1),

mysql-test/r/information_schema.result

+set global sql_mode="";
+set local sql_mode="";
 DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5;
 DROP VIEW IF EXISTS v1;
 show variables where variable_name like "skip_show_database";
@@ -2066,3 +2068,4 @@ Variable_name	Value
 Opened_tables	3
 drop database mysqltest;
 drop database db1;
+set global sql_mode=default;

mysql-test/r/information_schema_db.result

+set local sql_mode="";
+set global sql_mode="";
 drop table if exists t1,t2;
 drop view if exists v1,v2;
 drop function if exists f1;
@@ -216,3 +218,4 @@ show create view testdb_1.v1;
 ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v1'
 drop user mysqltest_1@localhost;
 drop database testdb_1;
+set global sql_mode=default;

mysql-test/r/information_schema_routines.result

+set sql_mode="";
+set sql_mode="";
 # ========== routines.1 ==========
 USE INFORMATION_SCHEMA;
 SHOW CREATE TABLE INFORMATION_SCHEMA.ROUTINES;

mysql-test/r/innodb_icp.result

@@ -416,11 +416,11 @@ DROP TABLE t1;
 # Bug#59259 "Incorrect rows returned for a correlated subquery
 #            when ICP is on"
 #
-CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 INSERT INTO t1 VALUES (11,0);
 INSERT INTO t1 VALUES (12,5);
 INSERT INTO t1 VALUES (15,0);
-CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
+CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 INSERT INTO t2 VALUES (11,1);
 INSERT INTO t2 VALUES (12,2);
 INSERT INTO t2 VALUES (15,4);

mysql-test/r/insert_notembedded.result

+set local sql_mode="";
+set global sql_mode="";
 drop table if exists t1;
 create table t1 (n int);
 create view  v1 as select * from t1;
@@ -125,3 +127,5 @@ a	b
 unlock tables;
 drop table t1;
 set low_priority_updates=default;
+set local sql_mode=default;
+set global sql_mode=default;

mysql-test/r/join_cache.result

@@ -39,7 +39,7 @@ COUNT(*)
 984
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 set join_cache_level=1;
 show variables like 'join_cache_level';
 Variable_name	Value
@@ -774,7 +774,7 @@ set join_cache_level=default;
 set join_buffer_size=default;
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 show variables like 'join_cache_level';
 Variable_name	Value
 join_cache_level	2
@@ -808,7 +808,7 @@ INDEX (Percentage)
 );
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 set join_cache_level=3;
 show variables like 'join_cache_level';
 Variable_name	Value
@@ -1008,7 +1008,7 @@ Russian Federation	NULL
 Vietnam	NULL
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 set join_cache_level=4;
 show variables like 'join_cache_level';
 Variable_name	Value
@@ -1267,7 +1267,7 @@ Czech Republic	10278100	NULL	NULL
 DROP INDEX City_Name ON City;
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 set join_cache_level=5;
 show variables like 'join_cache_level';
 Variable_name	Value
@@ -2688,7 +2688,7 @@ set join_cache_level=default;
 set join_buffer_size=default;
 show variables like 'join_buffer_size';
 Variable_name	Value
-join_buffer_size	131072
+join_buffer_size	262144
 show variables like 'join_cache_level';
 Variable_name	Value
 join_cache_level	2
@@ -5918,7 +5918,7 @@ select @@join_buffer_space_limit;
 8192
 select @@join_buffer_size;
 @@join_buffer_size
-131072
+262144
 explain select count(*) from t1, t1 t2 where t1.a=t2.a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	11	

mysql-test/r/kill.result

+set local sql_mode="";
+set global sql_mode="";
 SET DEBUG_SYNC = 'RESET';
 DROP TABLE IF EXISTS t1, t2, t3;
 DROP FUNCTION IF EXISTS MY_KILL;
@@ -322,3 +324,4 @@ SLEEP(1000)
 DROP USER u1@localhost;
 SET DEBUG_SYNC = 'RESET';
 DROP FUNCTION MY_KILL;
+set global sql_mode=default;

mysql-test/r/lock_multi.result

@@ -115,7 +115,9 @@ ERROR HY000: Can't execute the query because you have a conflicting read lock
 UNLOCK TABLES;
 DROP DATABASE mysqltest_1;
 ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist
+set sql_mode="";
 create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
+set sql_mode=default;
 lock tables t1 write;
 alter table t1 auto_increment=0;
 alter table t1 auto_increment=0;

mysql-test/r/log_tables.result

+SET SQL_MODE="";
 SET @old_general_log_state = @@global.general_log;
 SET @old_log_output=       @@global.log_output;
 SET @old_slow_query_log=   @@global.slow_query_log;

mysql-test/r/lowercase_fs_off.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 create database d1;
 grant all on d1.* to 'sample'@'localhost' identified by 'password';
 flush privileges;
@@ -63,3 +65,4 @@ CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW SET new.a= 1;
 RENAME TABLE t1 TO T1;
 ALTER TABLE T1 RENAME t1;
 DROP TABLE t1;
+set GLOBAL sql_mode=default;

mysql-test/r/lowercase_table_grant.result

 use mysql;
+set sql_mode="";
 create database MYSQLtest;
 grant all on MySQLtest.* to mysqltest_1@localhost;
 show grants for mysqltest_1@localhost;

mysql-test/r/lowercase_table_qcache.result

 set GLOBAL query_cache_size=1355776;
+set GLOBAL query_cache_type=ON;
+set LOCAL query_cache_type=ON;
 drop database if exists MySQLtesT;
 create database MySQLtesT;
 create table MySQLtesT.t1 (a int);
@@ -21,4 +23,5 @@ select * from MySQL.db;
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0
-set GLOBAL query_cache_size=0;
+set GLOBAL query_cache_size=default;
+set GLOBAL query_cache_type=default;

mysql-test/r/max_statement_time.result

@@ -52,6 +52,7 @@ DROP TABLE t1;
 
 # MAX_STATEMENT_TIME account resource
 
+set statement sql_mode="" for
 GRANT USAGE ON *.* TO user1@localhost WITH MAX_STATEMENT_TIME 1.005;
 # con1
 SELECT @@max_statement_time;

mysql-test/r/merge.result

@@ -2270,7 +2270,7 @@ CREATE TABLE t3(a int) ENGINE = MERGE UNION(t1, t2);
 CREATE TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo();
 SHOW CREATE TRIGGER tr1;
 Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connection	Database Collation
-tr1		CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo()	latin1	latin1_swedish_ci	latin1_swedish_ci
+tr1	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER INSERT ON t3 FOR EACH ROW CALL foo()	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP TRIGGER tr1;
 DROP TABLE t1, t2, t3;
 #
@@ -2545,11 +2545,14 @@ DROP TABLE t1;
 # Test merge table with too many merge children.
 #
 drop table if exists t_parent;
-set @save_table_definition_cache=@@global.table_definition_cache;
+set @save_table_open_cache=@@global.table_open_cache;
 #
-# Set @@global.table_definition_cache to minimum
+# Set @@global.table_open_cache to minimum
 #
-set @@global.table_definition_cache=400;
+set @@global.table_open_cache=400;
+select @@table_open_cache;
+@@table_open_cache
+400
 set @a=null;
 #
 # Create 400 merge children
@@ -2573,7 +2576,7 @@ deallocate prepare stmt;
 # Cleanup
 #
 drop table t_parent;
-set @@global.table_definition_cache=@save_table_definition_cache;
+set @@global.table_open_cache=@save_table_open_cache;
 DROP DATABASE IF EXISTS mysql_test1;
 CREATE DATABASE mysql_test1;
 CREATE TABLE t1 ... DATA DIRECTORY=... INDEX DIRECTORY=...

mysql-test/r/multi_update.result

@@ -422,6 +422,7 @@ create database mysqltest;
 create table mysqltest.t1 (a int, b int, primary key (a));
 create table mysqltest.t2 (a int, b int, primary key (a));
 create table mysqltest.t3 (a int, b int, primary key (a));
+create user mysqltest_1@localhost;
 grant select on mysqltest.* to mysqltest_1@localhost;
 grant update on mysqltest.t1 to mysqltest_1@localhost;
 update t1, t2 set t1.b=1 where t1.a=t2.a;

mysql-test/r/myisam_explain_non_select_all.result

@@ -2785,10 +2785,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	
 DROP TABLE t1,t2;
 #74
-CREATE TABLE t1(a INT PRIMARY KEY) ENGINE=InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
+CREATE TABLE t1(a INT PRIMARY KEY);
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5);
 # used key is modified & Using temporary
 #

mysql-test/r/myisam_icp.result

@@ -414,17 +414,11 @@ DROP TABLE t1;
 # Bug#59259 "Incorrect rows returned for a correlated subquery
 #            when ICP is on"
 #
-CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't1'
+CREATE TABLE t1 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 INSERT INTO t1 VALUES (11,0);
 INSERT INTO t1 VALUES (12,5);
 INSERT INTO t1 VALUES (15,0);
-CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL) ENGINE=InnoDB;
-Warnings:
-Warning	1286	Unknown storage engine 'InnoDB'
-Warning	1266	Using storage engine MyISAM for table 't2'
+CREATE TABLE t2 (pk INTEGER PRIMARY KEY, i INTEGER NOT NULL);
 INSERT INTO t2 VALUES (11,1);
 INSERT INTO t2 VALUES (12,2);
 INSERT INTO t2 VALUES (15,4);

mysql-test/r/mysql.result

+set GLOBAL sql_mode="";
+set LOCAL sql_mode="";
 drop table if exists t1,t2,t3;
 create table t1(a int);
 insert into t1 values(1);
@@ -531,5 +533,6 @@ a
 ERROR 1300 (HY000): Invalid utf8 character string: 'test\xF0\x9F\x98\x81 '
 ERROR 1300 (HY000): Invalid binary character string: 'test\xF0\x9F\x98\x81 '
 ERROR 1300 (HY000) at line 2: Invalid utf8 character string: 'test\xF0\x9F\x98\x81'
+set GLOBAL sql_mode=default;
 
 End of tests

mysql-test/r/mysql_comments.result

+set global sql_mode="";
 drop table if exists t1;
 drop function if exists foofct;
 drop procedure if exists empty;
@@ -59,4 +60,5 @@ Trigger	sql_mode	SQL Original Statement	character_set_client	collation_connectio
 t1_bi		CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n   comment 1c\n*/\n  -- declare some variables here\n  declare b int;\n  declare c float;\n\n  -- do more stuff here\n  -- commented nicely and so on\n\n  -- famous last words ...\n  set NEW.data := 12;\nend	latin1	latin1_swedish_ci	latin1_swedish_ci
 id	data
 trig	12
+set global sql_mode=default;
 End of 5.0 tests

mysql-test/r/mysql_upgrade.result

+set sql_mode="";
 Run mysql_upgrade once
 Phase 1/6: Checking and upgrading mysql database
 Processing databases
@@ -457,4 +458,5 @@ even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@loca
 even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost
 DROP USER very_long_user_name_number_1, very_long_user_name_number_2, even_longer_user_name_number_3_to_test_the_grantor_and_definer_field_length@localhost;
 DROP PROCEDURE test.pr;
+set sql_mode=default;
 End of tests

mysql-test/r/mysqlbinlog-innodb.result

@@ -30,7 +30,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -61,7 +61,7 @@ use `foo`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

mysql-test/r/mysqlbinlog.result

@@ -23,7 +23,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -103,7 +103,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -139,7 +139,7 @@ BEGIN
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -190,7 +190,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -217,7 +217,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -297,7 +297,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -333,7 +333,7 @@ BEGIN
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -384,7 +384,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -493,7 +493,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
@@ -545,7 +545,7 @@ use `test`/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 SET @@session.pseudo_thread_id=999999999/*!*/;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.unique_checks=1, @@session.autocommit=1/*!*/;
-SET @@session.sql_mode=0/*!*/;
+SET @@session.sql_mode=1342177280/*!*/;
 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

mysql-test/r/mysqld--help.result

@@ -21,9 +21,10 @@ The following options may be given as the first argument:
  --automatic-sp-privileges 
  Creating and dropping stored procedures alters ACLs
  (Defaults to on; use --skip-automatic-sp-privileges to disable.)
- --back-log=#        The number of outstanding connection requests MySQL can
+ --back-log=#        The number of outstanding connection requests MariaDB can
  have. This comes into play when the main MySQL thread
  gets very many connection requests in a very short time
+ (Automatically configured unless set explicitly)
  -b, --basedir=name  Path to installation directory. All paths are usually
  resolved relative to this
  --big-tables        Allow big result sets by saving all temporary sets on
@@ -265,6 +266,7 @@ The following options may be given as the first argument:
  height-balanced, DOUBLE_PREC_HB - double precision
  height-balanced.
  --host-cache-size=# How many host names should be cached to avoid resolving.
+ (Automatically configured unless set explicitly)
  --ignore-builtin-innodb 
  Disable initialization of builtin InnoDB plugin
  --ignore-db-dirs=name 
@@ -895,6 +897,7 @@ The following options may be given as the first argument:
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old
  (pre-4.1) passwords
+ (Defaults to on; use --skip-secure-auth to disable.)
  --secure-file-priv=name 
  Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to
  files within specified directory
@@ -1043,13 +1046,12 @@ The following options may be given as the first argument:
  (Defaults to on; use --skip-sync-frm to disable.)
  --sync-master-info=# 
  Synchronously flush master info to disk after every #th
- event. Use 0 (default) to disable synchronous flushing
+ event. Use 0 to disable synchronous flushing
  --sync-relay-log=#  Synchronously flush relay log to disk after every #th
- event. Use 0 (default) to disable synchronous flushing
+ event. Use 0 to disable synchronous flushing
  --sync-relay-log-info=# 
  Synchronously flush relay log info to disk after every
- #th transaction. Use 0 (default) to disable synchronous
- flushing
+ #th transaction. Use 0 to disable synchronous flushing
  --sysdate-is-now    Non-default option to alias SYSDATE() to NOW() to make it
  safe-replicable. Since 5.0, SYSDATE() returns a `dynamic'
  value different for different invocations, even within
@@ -1131,7 +1133,7 @@ auto-increment-increment 1
 auto-increment-offset 1
 autocommit TRUE
 automatic-sp-privileges TRUE
-back-log 150
+back-log 80
 big-tables FALSE
 bind-address (No default value)
 binlog-annotate-row-events FALSE
@@ -1199,7 +1201,7 @@ gtid-strict-mode FALSE
 help TRUE
 histogram-size 0
 histogram-type SINGLE_PREC_HB
-host-cache-size 128
+host-cache-size 279
 ignore-builtin-innodb FALSE
 ignore-db-dirs 
 init-connect 
@@ -1207,7 +1209,7 @@ init-file (No default value)
 init-rpl-role MASTER
 init-slave 
 interactive-timeout 28800
-join-buffer-size 131072
+join-buffer-size 262144
 join-buffer-space-limit 2097152
 join-cache-level 2
 keep-files-on-create FALSE
@@ -1245,7 +1247,7 @@ lower-case-table-names 1
 master-info-file master.info
 master-retry-count 86400
 master-verify-checksum FALSE
-max-allowed-packet 1048576
+max-allowed-packet 4194304
 max-binlog-cache-size 18446744073709547520
 max-binlog-size 1073741824
 max-binlog-stmt-cache-size 18446744073709547520
@@ -1257,7 +1259,7 @@ max-error-count 64
 max-heap-table-size 16777216
 max-join-size 18446744073709551615
 max-length-for-sort-data 1024
-max-long-data-size 1048576
+max-long-data-size 4194304
 max-prepared-stmt-count 16382
 max-relay-log-size 1073741824
 max-seeks-for-key 18446744073709551615
@@ -1352,9 +1354,9 @@ protocol-version 10
 query-alloc-block-size 16384
 query-cache-limit 1048576
 query-cache-min-res-unit 4096
-query-cache-size 0
+query-cache-size 1048576
 query-cache-strip-comments FALSE
-query-cache-type ON
+query-cache-type OFF
 query-cache-wlock-invalidate FALSE
 query-prealloc-size 24576
 range-alloc-block-size 4096
@@ -1376,7 +1378,7 @@ report-port 0
 report-user (No default value)
 rowid-merge-buff-size 8388608
 safe-user-create FALSE
-secure-auth FALSE
+secure-auth TRUE
 secure-file-priv (No default value)
 server-id 0
 show-slave-auth-info FALSE
@@ -1402,20 +1404,20 @@ slave-type-conversions
 slow-launch-time 2
 slow-query-log FALSE
 sort-buffer-size 2097152
-sql-mode 
+sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 stack-trace TRUE
 stored-program-cache 256
 strict-password-validation TRUE
 symbolic-links FALSE
 sync-binlog 0
 sync-frm FALSE
-sync-master-info 0
-sync-relay-log 0
-sync-relay-log-info 0
+sync-master-info 10000
+sync-relay-log 10000
+sync-relay-log-info 10000
 sysdate-is-now FALSE
-table-cache 400
+table-cache 2000
 table-definition-cache 400
-table-open-cache 400
+table-open-cache 2000
 tc-heuristic-recover COMMIT
 thread-cache-size 0
 thread-pool-idle-timeout 60

mysql-test/r/mysqldump.result

@@ -2468,10 +2468,10 @@ if new.a > 10 then
 set new.a := 10;
 set new.a := 11;
 end if;
-end	BEFORE	0000-00-00 00:00:00		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	0000-00-00 00:00:00	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg2	UPDATE	t1	begin
 if old.a % 2 = 0 then set new.b := 12; end if;
-end	BEFORE	0000-00-00 00:00:00		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	0000-00-00 00:00:00	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg3	UPDATE	t1	begin
 if new.a = -1 then
 set @fired:= "Yes";
@@ -2515,7 +2515,7 @@ UNLOCK TABLES;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg1 before insert on t1 for each row
 begin
@@ -2536,7 +2536,7 @@ DELIMITER ;
 /*!50003 SET character_set_results = latin1 */ ;
 /*!50003 SET collation_connection  = latin1_swedish_ci */ ;
 /*!50003 SET @saved_sql_mode       = @@sql_mode */ ;
-/*!50003 SET sql_mode              = '' */ ;
+/*!50003 SET sql_mode              = 'NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
 DELIMITER ;;
 /*!50003 CREATE*/ /*!50017 DEFINER=`root`@`localhost`*/ /*!50003 trigger trg2 before update on t1 for each row begin
 if old.a % 2 = 0 then set new.b := 12; end if;
@@ -2671,10 +2671,10 @@ if new.a > 10 then
 set new.a := 10;
 set new.a := 11;
 end if;
-end	BEFORE	#		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	#	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg2	UPDATE	t1	begin
 if old.a % 2 = 0 then set new.b := 12; end if;
-end	BEFORE	#		root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
+end	BEFORE	#	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	root@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 trg3	UPDATE	t1	begin
 if new.a = -1 then
 set @fired:= "Yes";

mysql-test/r/openssl_1.result

+set local sql_mode="";
+set global sql_mode="";
 drop table if exists t1;
 create table t1(f1 int);
 insert into t1 values (5);
@@ -206,4 +208,5 @@ SHOW STATUS LIKE 'Ssl_cipher';
 Variable_name	Value
 Ssl_cipher	DHE-RSA-AES256-SHA
 DROP USER bug42158@localhost;
+set global sql_mode=default;
 End of 5.1 tests

mysql-test/r/openssl_6975,tlsv10.result

+create user ssl_sslv3@localhost;
 grant select on test.* to ssl_sslv3@localhost require cipher "RC4-SHA";
+create user ssl_tls12@localhost;
 grant select on test.* to ssl_tls12@localhost require cipher "AES128-SHA256";
 TLS1.2 ciphers: user is ok with any cipher
 ERROR 2026 (HY000): SSL connection error: error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure

mysql-test/r/openssl_6975,tlsv12.result

+create user ssl_sslv3@localhost;
 grant select on test.* to ssl_sslv3@localhost require cipher "RC4-SHA";
+create user ssl_tls12@localhost;
 grant select on test.* to ssl_tls12@localhost require cipher "AES128-SHA256";
 TLS1.2 ciphers: user is ok with any cipher
 Variable_name	Value

mysql-test/r/partition_cache.result

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 SET SESSION STORAGE_ENGINE = InnoDB;
 drop table if exists t1,t2,t3;
 set @save_query_cache_size = @@global.query_cache_size;
@@ -203,3 +205,4 @@ Variable_name	Value
 Qcache_hits	1
 set @@global.query_cache_size = @save_query_cache_size;
 drop table t2;
+SET global query_cache_type=default;

mysql-test/r/partition_cache_innodb.result

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 SET SESSION STORAGE_ENGINE = innodb;
 drop table if exists t1;
 set @save_query_cache_size = @@global.query_cache_size;
@@ -149,3 +151,4 @@ Variable_name	Value
 Qcache_hits	1
 drop table t1;
 set @@global.query_cache_size = @save_query_cache_size;
+SET global query_cache_type=default;

mysql-test/r/partition_cache_myisam.result

+SET global query_cache_type=ON;
+SET local query_cache_type=ON;
 SET SESSION STORAGE_ENGINE = myisam;
 drop table if exists t1;
 set @save_query_cache_size = @@global.query_cache_size;
@@ -151,3 +153,4 @@ Variable_name	Value
 Qcache_hits	2
 drop table t1;
 set @@global.query_cache_size = @save_query_cache_size;
+SET global query_cache_type=default;

mysql-test/r/partition_grant.result

@@ -3,6 +3,7 @@ create schema mysqltest_1;
 use mysqltest_1;
 create table t1 (a int) partition by list (a) (partition p1 values in (1), partition p2 values in (2), partition p3 values in (3));
 insert into t1 values (1),(2);
+create user mysqltest_1@localhost;
 grant usage on *.* to mysqltest_1@localhost;
 revoke all privileges on *.* from mysqltest_1@localhost;
 grant select,alter on mysqltest_1.* to mysqltest_1@localhost;

mysql-test/r/partition_hash.result

@@ -166,9 +166,11 @@ select * from t1;
 f1	f2
 -1	#######
 drop table t1;
+set sql_mode="";
 CREATE TABLE t1 (s1 int) ENGINE=BLACKHOLE PARTITION BY HASH (s1);
 INSERT INTO t1 VALUES (0);
 DROP TABLE t1;
+set sql_mode=default;
 create table t1 (c1 int DEFAULT NULL,
 c2 varchar (30) DEFAULT NULL,
 c3 date DEFAULT NULL)

mysql-test/r/partition_innodb.result

@@ -429,6 +429,7 @@ where a between '2006-01-01' and '2007-06-01';
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	2	Using where
 drop table t1;
+SET SQL_MODE="";
 create table t1 (a int)
 engine = x
 partition by key (a);
@@ -457,6 +458,7 @@ t1	CREATE TABLE `t1` (
 /*!50100 PARTITION BY LIST (a)
 (PARTITION p0 VALUES IN (0) ENGINE = InnoDB) */
 drop table t1;
+SET SQL_MODE=default;
 create table t1
 (
 id int unsigned auto_increment,

mysql-test/r/plugin.result

 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
-Warnings:
-Warning	1286	Unknown storage engine 'EXAMPLE'
-Warning	1266	Using storage engine MyISAM for table 't1'
-DROP TABLE t1;
+ERROR 42000: Unknown storage engine 'EXAMPLE'
 INSTALL PLUGIN example SONAME 'ha_example';
 INSTALL PLUGIN EXAMPLE SONAME 'ha_example';
 ERROR HY000: Plugin 'EXAMPLE' already installed

mysql-test/r/plugin_auth.result

+SET GLOBAL SQL_MODE="";
+SET LOCAL SQL_MODE="";
 SELECT PLUGIN_STATUS, PLUGIN_TYPE, PLUGIN_DESCRIPTION
 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME='test_plugin_server';
 PLUGIN_STATUS	ACTIVE
@@ -44,7 +46,7 @@ plug@localhost	plug_dest@%
 ## test no_auto_create_user sql mode with plugin users
 SET @@sql_mode=no_auto_create_user;
 GRANT INSERT ON TEST.* TO grant_user IDENTIFIED WITH 'test_plugin_server';
-SET @@sql_mode=default;
+SET @@sql_mode="";
 DROP USER grant_user;
 ## test utf-8 user name
 CREATE USER `Ÿ` IDENTIFIED WITH 'test_plugin_server' AS 'plug_dest';
@@ -426,4 +428,5 @@ USER()	CURRENT_USER()
 bug12818542@localhost	bug12818542_dest@localhost
 DROP USER bug12818542@localhost;
 DROP USER bug12818542_dest@localhost;
+SET GLOBAL SQL_MODE=default;
 End of 5.5 tests