Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean

into hh-nb.hungers:/work/merge/mysql-5.1-build

Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build
c3e0ed6a · unknown · 6116e306 · 9c63b06c · c3e0ed6a · c3e0ed6a
Commit c3e0ed6a authored Apr 16, 2008 by unknown
12 changed files
--- 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;

--- 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
 ###################################################

--- 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
 ###################################################

--- 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 #

--- 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


--- 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
 ################################################

--- 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


--- 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


--- 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


--- 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


--- 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

--- 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;