diff options
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/character_set_client_basic.test | 7 | ||||
| -rw-r--r-- | mysql-test/t/character_set_connection_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/character_set_database_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/character_set_database_func.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/character_set_filesystem_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/character_set_results_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/character_set_server_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/collation_connection_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/collation_database_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/collation_server_basic.test | 5 | ||||
| -rw-r--r-- | mysql-test/t/completion_type_func.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/max_prepared_stmt_count_func.test | 2 |
12 files changed, 52 insertions, 1 deletions
diff --git a/mysql-test/t/character_set_client_basic.test b/mysql-test/t/character_set_client_basic.test index 7eaee2e28b4..f07e9407047 100644 --- a/mysql-test/t/character_set_client_basic.test +++ b/mysql-test/t/character_set_client_basic.test @@ -22,6 +22,12 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc +--source include/have_ucs2.inc --source include/load_sysvars.inc ################################################### @@ -114,7 +120,6 @@ SET @@character_set_client = utf8 + latin2; ############################################################################## # Change the value of character_set_client to a valid value for session # ############################################################################## ---Error 0,ER_UNKNOWN_CHARACTER_SET SET @@character_set_client = big5; SELECT @@character_set_client; SET @@character_set_client = dec8; diff --git a/mysql-test/t/character_set_connection_basic.test b/mysql-test/t/character_set_connection_basic.test index 6aa26e8dbc3..b300c8c827e 100644 --- a/mysql-test/t/character_set_connection_basic.test +++ b/mysql-test/t/character_set_connection_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc ################################################### diff --git a/mysql-test/t/character_set_database_basic.test b/mysql-test/t/character_set_database_basic.test index e744c47ebd0..5fbba83dffd 100644 --- a/mysql-test/t/character_set_database_basic.test +++ b/mysql-test/t/character_set_database_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc ################################################### diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/t/character_set_database_func.test index 2b17f4cf99e..b2d2d017d64 100644 --- a/mysql-test/t/character_set_database_func.test +++ b/mysql-test/t/character_set_database_func.test @@ -19,6 +19,8 @@ # # ############################################################################### +--source include/have_utf8.inc + --echo '#--------------------FN_DYNVARS_008_01-------------------------#' ######################################################################## # Check if setting character_set_database is changed in new connection # diff --git a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/t/character_set_filesystem_basic.test index 7034179ef48..37f06e886f1 100644 --- a/mysql-test/t/character_set_filesystem_basic.test +++ b/mysql-test/t/character_set_filesystem_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc diff --git a/mysql-test/t/character_set_results_basic.test b/mysql-test/t/character_set_results_basic.test index 26f4b0be73d..71f8d7d5e7b 100644 --- a/mysql-test/t/character_set_results_basic.test +++ b/mysql-test/t/character_set_results_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc ################################################ diff --git a/mysql-test/t/character_set_server_basic.test b/mysql-test/t/character_set_server_basic.test index e2d2a9ca9fc..985ff8d220a 100644 --- a/mysql-test/t/character_set_server_basic.test +++ b/mysql-test/t/character_set_server_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc diff --git a/mysql-test/t/collation_connection_basic.test b/mysql-test/t/collation_connection_basic.test index 5e1033d6ead..f1551b2a046 100644 --- a/mysql-test/t/collation_connection_basic.test +++ b/mysql-test/t/collation_connection_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc diff --git a/mysql-test/t/collation_database_basic.test b/mysql-test/t/collation_database_basic.test index 478ecbdb9ab..c1c520647f5 100644 --- a/mysql-test/t/collation_database_basic.test +++ b/mysql-test/t/collation_database_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc diff --git a/mysql-test/t/collation_server_basic.test b/mysql-test/t/collation_server_basic.test index b13543058f8..8e4d3fd83e7 100644 --- a/mysql-test/t/collation_server_basic.test +++ b/mysql-test/t/collation_server_basic.test @@ -22,6 +22,11 @@ # server-system-variables.html # # # ############################################################################### +--source include/have_big5.inc +--source include/have_ujis.inc +--source include/have_sjis.inc +--source include/have_utf8.inc +--source include/have_uds.inc --source include/load_sysvars.inc diff --git a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test index 71d66dac777..4f1ebf6700b 100644 --- a/mysql-test/t/completion_type_func.test +++ b/mysql-test/t/completion_type_func.test @@ -19,6 +19,8 @@ # # ################################################################################ +--source include/have_innodb.inc + --disable_warnings drop table if exists t1; --enable_warnings diff --git a/mysql-test/t/max_prepared_stmt_count_func.test b/mysql-test/t/max_prepared_stmt_count_func.test index d6c968633ee..6617c4ad2ea 100644 --- a/mysql-test/t/max_prepared_stmt_count_func.test +++ b/mysql-test/t/max_prepared_stmt_count_func.test @@ -147,4 +147,6 @@ DROP PREPARE stmt1; DROP PREPARE stmt2; DROP PREPARE stmt3; +DROP PROCEDURE sp_checkstmts; + SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count; |