Below is the list of changes that have just been committed into a local
5.1 repository of hhunger. When hhunger does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-04-16 10:23:07+02:00, hhunger@stripped +12 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_client_basic.test@stripped, 2008-04-16 10:23:04+02:00, hhunger@stripped +6 -1
fourth set of fixes for bug#35988.
mysql-test/t/character_set_connection_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_database_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_database_func.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +2 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_filesystem_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_results_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/character_set_server_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/collation_connection_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/collation_database_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/collation_server_basic.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +5 -0
fourth set of fixes for bug#35988.
mysql-test/t/completion_type_func.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +2 -0
fourth set of fixes for bug#35988.
mysql-test/t/max_prepared_stmt_count_func.test@stripped, 2008-04-16 10:23:05+02:00, hhunger@stripped +2 -0
fourth set of fixes for bug#35988.
diff -Nrup a/mysql-test/t/character_set_client_basic.test b/mysql-test/t/character_set_client_basic.test
--- a/mysql-test/t/character_set_client_basic.test 2008-04-15 15:44:08 +02:00
+++ b/mysql-test/t/character_set_client_basic.test 2008-04-16 10:23:04 +02:00
@@ -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 + lati
##############################################################################
# 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 -Nrup a/mysql-test/t/character_set_connection_basic.test b/mysql-test/t/character_set_connection_basic.test
--- a/mysql-test/t/character_set_connection_basic.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_connection_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_database_basic.test b/mysql-test/t/character_set_database_basic.test
--- a/mysql-test/t/character_set_database_basic.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_database_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_database_func.test b/mysql-test/t/character_set_database_func.test
--- a/mysql-test/t/character_set_database_func.test 2008-04-14 17:21:08 +02:00
+++ b/mysql-test/t/character_set_database_func.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_filesystem_basic.test b/mysql-test/t/character_set_filesystem_basic.test
--- a/mysql-test/t/character_set_filesystem_basic.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_filesystem_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_results_basic.test b/mysql-test/t/character_set_results_basic.test
--- a/mysql-test/t/character_set_results_basic.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_results_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/character_set_server_basic.test b/mysql-test/t/character_set_server_basic.test
--- a/mysql-test/t/character_set_server_basic.test 2008-04-10 15:13:48 +02:00
+++ b/mysql-test/t/character_set_server_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/collation_connection_basic.test b/mysql-test/t/collation_connection_basic.test
--- a/mysql-test/t/collation_connection_basic.test 2008-04-10 15:13:49 +02:00
+++ b/mysql-test/t/collation_connection_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/collation_database_basic.test b/mysql-test/t/collation_database_basic.test
--- a/mysql-test/t/collation_database_basic.test 2008-04-10 15:13:49 +02:00
+++ b/mysql-test/t/collation_database_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/collation_server_basic.test b/mysql-test/t/collation_server_basic.test
--- a/mysql-test/t/collation_server_basic.test 2008-04-10 15:13:49 +02:00
+++ b/mysql-test/t/collation_server_basic.test 2008-04-16 10:23:05 +02:00
@@ -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 -Nrup a/mysql-test/t/completion_type_func.test b/mysql-test/t/completion_type_func.test
--- a/mysql-test/t/completion_type_func.test 2008-04-14 17:21:08 +02:00
+++ b/mysql-test/t/completion_type_func.test 2008-04-16 10:23:05 +02:00
@@ -19,6 +19,8 @@
# #
################################################################################
+--source include/have_innodb.inc
+
--disable_warnings
drop table if exists t1;
--enable_warnings
diff -Nrup a/mysql-test/t/max_prepared_stmt_count_func.test b/mysql-test/t/max_prepared_stmt_count_func.test
--- a/mysql-test/t/max_prepared_stmt_count_func.test 2008-04-10 15:14:01 +02:00
+++ b/mysql-test/t/max_prepared_stmt_count_func.test 2008-04-16 10:23:05 +02:00
@@ -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;
| Thread |
|---|
| • bk commit into 5.1 tree (hhunger:1.2593) BUG#35988 | horst | 16 Apr |
