diff options
author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/suite/funcs_1 | |
parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/suite/funcs_1')
18 files changed, 30 insertions, 4 deletions
diff --git a/mysql-test/suite/funcs_1/datadict/is_routines.inc b/mysql-test/suite/funcs_1/datadict/is_routines.inc index a6e0931ca42..35b31c35553 100644 --- a/mysql-test/suite/funcs_1/datadict/is_routines.inc +++ b/mysql-test/suite/funcs_1/datadict/is_routines.inc @@ -18,6 +18,8 @@ # 2008-06-11 mleich Move t/is_routines.test to this file and # create variants for embedded/non embedded server. # + +--source include/default_charset.inc set sql_mode=""; let $engine_type = MEMORY; diff --git a/mysql-test/suite/funcs_1/datadict/is_schemata.inc b/mysql-test/suite/funcs_1/datadict/is_schemata.inc index 0a3f0e726b3..267d3c272b9 100644 --- a/mysql-test/suite/funcs_1/datadict/is_schemata.inc +++ b/mysql-test/suite/funcs_1/datadict/is_schemata.inc @@ -18,6 +18,7 @@ # create variants for embedded/non embedded server. # +--source include/default_charset.inc let $is_table = SCHEMATA; # The table INFORMATION_SCHEMA.SCHEMATA must exist diff --git a/mysql-test/suite/funcs_1/datadict/is_tables.inc b/mysql-test/suite/funcs_1/datadict/is_tables.inc index 2059917247c..b3d0ef4cca5 100644 --- a/mysql-test/suite/funcs_1/datadict/is_tables.inc +++ b/mysql-test/suite/funcs_1/datadict/is_tables.inc @@ -20,6 +20,8 @@ # create variants for embedded/non embedded server. # +--source include/default_charset.inc + let $engine_type = MEMORY; let $other_engine_type = MyISAM; diff --git a/mysql-test/suite/funcs_1/datadict/is_triggers.inc b/mysql-test/suite/funcs_1/datadict/is_triggers.inc index 3a449c93c4b..5dda419ab82 100644 --- a/mysql-test/suite/funcs_1/datadict/is_triggers.inc +++ b/mysql-test/suite/funcs_1/datadict/is_triggers.inc @@ -19,6 +19,9 @@ # 2008-06-11 mleich Move t/is_triggers.test to this file and # create variants for embedded/non embedded server. # + +--source include/default_charset.inc +set @save_sql_mode=@@global.sql_mode; set global sql_mode=""; let $engine_type = MEMORY; @@ -265,4 +268,5 @@ ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers; # Cleanup DROP DATABASE db_datadict; -set global sql_mode=default; +set global sql_mode=@save_sql_mode; + diff --git a/mysql-test/suite/funcs_1/datadict/tables.inc b/mysql-test/suite/funcs_1/datadict/tables.inc index 5c83b11eb66..ad9abc3f4d7 100644 --- a/mysql-test/suite/funcs_1/datadict/tables.inc +++ b/mysql-test/suite/funcs_1/datadict/tables.inc @@ -9,6 +9,8 @@ # 2008-06-04 mleich Create this script based on older scripts and new code. # +--source include/default_charset.inc + # Just have some tables within different databases. --disable_warnings DROP DATABASE IF EXISTS test1; diff --git a/mysql-test/suite/funcs_1/r/is_triggers.result b/mysql-test/suite/funcs_1/r/is_triggers.result index e9b6b31451a..1127dc3ff44 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers.result +++ b/mysql-test/suite/funcs_1/r/is_triggers.result @@ -1,3 +1,4 @@ +set @save_sql_mode=@@global.sql_mode; set global sql_mode=""; SHOW TABLES FROM information_schema LIKE 'TRIGGERS'; Tables_in_information_schema (TRIGGERS) @@ -234,4 +235,4 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' DROP DATABASE db_datadict; -set global sql_mode=default; +set global sql_mode=@save_sql_mode; diff --git a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result index 56c0e22d685..6ec9e7868ce 100644 --- a/mysql-test/suite/funcs_1/r/is_triggers_embedded.result +++ b/mysql-test/suite/funcs_1/r/is_triggers_embedded.result @@ -1,3 +1,4 @@ +set @save_sql_mode=@@global.sql_mode; set global sql_mode=""; SHOW TABLES FROM information_schema LIKE 'TRIGGERS'; Tables_in_information_schema (TRIGGERS) @@ -231,4 +232,4 @@ ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_ ALTER TABLE information_schema.triggers RENAME information_schema.xtriggers; ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema' DROP DATABASE db_datadict; -set global sql_mode=default; +set global sql_mode=@save_sql_mode; diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc index 74ef7f4fbed..ec8bd08c31e 100644 --- a/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc +++ b/mysql-test/suite/funcs_1/storedproc/storedproc_07.inc @@ -1,5 +1,6 @@ #### suite/funcs_1/storedproc/storedproc_07.inc # +--source include/default_charset.inc --source suite/funcs_1/storedproc/load_sp_tb.inc # ============================================================================== diff --git a/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc index 9a693c5b96f..9f0304a34e2 100644 --- a/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc +++ b/mysql-test/suite/funcs_1/storedproc/storedproc_08.inc @@ -1,5 +1,6 @@ #### suite/funcs_1/storedproc/storedproc_08.inc # +--source include/default_charset.inc --source suite/funcs_1/storedproc/load_sp_tb.inc # ============================================================================== diff --git a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test index 97ea74b9b55..bb6bb3d1d7e 100644 --- a/mysql-test/suite/funcs_1/t/innodb_trig_03e.test +++ b/mysql-test/suite/funcs_1/t/innodb_trig_03e.test @@ -3,6 +3,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc # InnoDB tables should be used # diff --git a/mysql-test/suite/funcs_1/t/is_columns.test b/mysql-test/suite/funcs_1/t/is_columns.test index 5fb72713742..c167740b72c 100644 --- a/mysql-test/suite/funcs_1/t/is_columns.test +++ b/mysql-test/suite/funcs_1/t/is_columns.test @@ -19,6 +19,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc let $engine_type = MEMORY; let $other_engine_type = MyISAM; diff --git a/mysql-test/suite/funcs_1/t/is_columns_innodb.test b/mysql-test/suite/funcs_1/t/is_columns_innodb.test index 7d8ca9a3a8e..275c9805871 100644 --- a/mysql-test/suite/funcs_1/t/is_columns_innodb.test +++ b/mysql-test/suite/funcs_1/t/is_columns_innodb.test @@ -13,8 +13,9 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc - --source include/have_innodb.inc +--source include/default_charset.inc + let $engine_type= InnoDB; --source suite/funcs_1/datadict/datadict_load.inc diff --git a/mysql-test/suite/funcs_1/t/is_columns_memory.test b/mysql-test/suite/funcs_1/t/is_columns_memory.test index b76325d114a..8ec32895217 100644 --- a/mysql-test/suite/funcs_1/t/is_columns_memory.test +++ b/mysql-test/suite/funcs_1/t/is_columns_memory.test @@ -13,6 +13,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc let $engine_type= MEMORY; SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; diff --git a/mysql-test/suite/funcs_1/t/is_columns_myisam.test b/mysql-test/suite/funcs_1/t/is_columns_myisam.test index 09b5b088489..9b9974044aa 100644 --- a/mysql-test/suite/funcs_1/t/is_columns_myisam.test +++ b/mysql-test/suite/funcs_1/t/is_columns_myisam.test @@ -13,6 +13,8 @@ # --source include/not_embedded.inc +--source include/default_charset.inc + let $engine_type= MyISAM; SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION'; --source suite/funcs_1/datadict/datadict_load.inc diff --git a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test index 6b515bc596a..76c0b4974d5 100644 --- a/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test +++ b/mysql-test/suite/funcs_1/t/is_schemata_is_mysql_test.test @@ -12,6 +12,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc --echo ################################################################################# --echo # Testcases 3.2.9.2 + 3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information diff --git a/mysql-test/suite/funcs_1/t/memory_trig_03e.test b/mysql-test/suite/funcs_1/t/memory_trig_03e.test index fee02fbb3d7..5224143aa2f 100644 --- a/mysql-test/suite/funcs_1/t/memory_trig_03e.test +++ b/mysql-test/suite/funcs_1/t/memory_trig_03e.test @@ -3,6 +3,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc # Memory tables should be used # diff --git a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test index 9beb79c2288..280f935b4e2 100644 --- a/mysql-test/suite/funcs_1/t/myisam_trig_03e.test +++ b/mysql-test/suite/funcs_1/t/myisam_trig_03e.test @@ -3,6 +3,7 @@ # This test cannot be used for the embedded server because we check here # privileges. --source include/not_embedded.inc +--source include/default_charset.inc # MyISAM tables should be used # diff --git a/mysql-test/suite/funcs_1/t/storedproc.test b/mysql-test/suite/funcs_1/t/storedproc.test index 98385d42b22..f5852ea016f 100644 --- a/mysql-test/suite/funcs_1/t/storedproc.test +++ b/mysql-test/suite/funcs_1/t/storedproc.test @@ -9,6 +9,8 @@ # - restore global sort_buffer_size after some subtest # ############################################################################ + +--source include/default_charset.inc set sql_mode=""; # Bug#37746 - Arithmetic range ("int") is smaller than expected |