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
bfdff281 · unknown · c3e0ed6a · 14f753d4 · bfdff281 · bfdff281
Commit bfdff281 authored Apr 16, 2008 by unknown
14 changed files
--- a/mysql-test/r/max_prepared_stmt_count_func.result
+++ b/mysql-test/r/max_prepared_stmt_count_func.result
@@ -78,4 +78,5 @@ DROP PREPARE stmt;
 DROP PREPARE stmt1;
 DROP PREPARE stmt2;
 DROP PREPARE stmt3;
+DROP PROCEDURE sp_checkstmts;
 SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count;
--- a/mysql-test/t/character_set_client_basic.test
+++ b/mysql-test/t/character_set_client_basic.test
@@ -26,7 +26,6 @@
 --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

--- a/mysql-test/t/character_set_connection_basic.test
+++ b/mysql-test/t/character_set_connection_basic.test
@@ -26,7 +26,7 @@
 --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
 ###################################################

--- a/mysql-test/t/character_set_database_basic.test
+++ b/mysql-test/t/character_set_database_basic.test
@@ -26,7 +26,7 @@
 --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
 ###################################################

--- a/mysql-test/t/character_set_filesystem_basic.test
+++ b/mysql-test/t/character_set_filesystem_basic.test
@@ -26,7 +26,7 @@
 --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


--- a/mysql-test/t/character_set_results_basic.test
+++ b/mysql-test/t/character_set_results_basic.test
@@ -26,7 +26,7 @@
 --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
 ################################################

--- a/mysql-test/t/character_set_server_basic.test
+++ b/mysql-test/t/character_set_server_basic.test
@@ -26,7 +26,7 @@
 --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


--- a/mysql-test/t/collation_connection_basic.test
+++ b/mysql-test/t/collation_connection_basic.test
@@ -26,7 +26,7 @@
 --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


--- a/mysql-test/t/collation_database_basic.test
+++ b/mysql-test/t/collation_database_basic.test
@@ -26,7 +26,7 @@
 --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


--- a/mysql-test/t/collation_server_basic.test
+++ b/mysql-test/t/collation_server_basic.test
@@ -26,7 +26,7 @@
 --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


--- a/mysql-test/t/div_precision_increment_func.test
+++ b/mysql-test/t/div_precision_increment_func.test
@@ -19,6 +19,7 @@
 #                                                                              #
 ################################################################################

+SET @save_div_precision_increment = @@global.div_presision_increment;

 --disable_warnings
 drop table if exists t1;
@@ -118,7 +119,7 @@ drop table t1;
 disconnect test_con1;
 disconnect test_con2;

-
+SET @@global.div_prescision_increment = @save_div_precision_increment;




--- a/mysql-test/t/ssl_ca_basic.test
+++ b/mysql-test/t/ssl_ca_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################

--source include/have_ssl.inc
+-- source include/have_ssl.inc

 --echo '#---------------------BS_STVARS_045_01----------------------#'
 ####################################################################

--- a/mysql-test/t/ssl_cert_basic.test
+++ b/mysql-test/t/ssl_cert_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################

--source include/have_ssl.inc
+-- source include/have_ssl.inc

 --echo '#---------------------BS_STVARS_047_01----------------------#'
 ####################################################################

--- a/mysql-test/t/ssl_key_basic.test
+++ b/mysql-test/t/ssl_key_basic.test
@@ -22,7 +22,7 @@
 #                                                                             #
 ###############################################################################

--source include/have_ssl.inc
+-- source include/have_ssl.inc

 --echo '#---------------------BS_STVARS_049_01----------------------#'
 ####################################################################