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 16:32:33+02:00, hhunger@stripped +14 -0
fifth set of fixes to bug#35988.
mysql-test/r/max_prepared_stmt_count_func.result@stripped, 2008-04-16 16:32:29+02:00, hhunger@stripped +1 -0
fifth set of fixes to bug#35988.
mysql-test/t/character_set_client_basic.test@stripped, 2008-04-16 16:32:29+02:00, hhunger@stripped +0 -1
fifth set of fixes to bug#35988.
mysql-test/t/character_set_connection_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/character_set_database_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/character_set_filesystem_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/character_set_results_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/character_set_server_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/collation_connection_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/collation_database_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/collation_server_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/div_precision_increment_func.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +2 -1
fifth set of fixes to bug#35988.
mysql-test/t/ssl_ca_basic.test@stripped, 2008-04-16 16:32:30+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/ssl_cert_basic.test@stripped, 2008-04-16 16:32:31+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
mysql-test/t/ssl_key_basic.test@stripped, 2008-04-16 16:32:31+02:00, hhunger@stripped +1 -1
fifth set of fixes to bug#35988.
diff -Nrup a/mysql-test/r/max_prepared_stmt_count_func.result b/mysql-test/r/max_prepared_stmt_count_func.result
--- a/mysql-test/r/max_prepared_stmt_count_func.result 2008-04-10 15:13:36 +02:00
+++ b/mysql-test/r/max_prepared_stmt_count_func.result 2008-04-16 16:32:29 +02:00
@@ -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;
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-16 10:23:04 +02:00
+++ b/mysql-test/t/character_set_client_basic.test 2008-04-16 16:32:29 +02:00
@@ -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
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_connection_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
###################################################
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_database_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
###################################################
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_filesystem_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_results_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
################################################
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-16 10:23:05 +02:00
+++ b/mysql-test/t/character_set_server_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
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-16 10:23:05 +02:00
+++ b/mysql-test/t/collation_connection_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
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-16 10:23:05 +02:00
+++ b/mysql-test/t/collation_database_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
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-16 10:23:05 +02:00
+++ b/mysql-test/t/collation_server_basic.test 2008-04-16 16:32:30 +02:00
@@ -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
diff -Nrup a/mysql-test/t/div_precision_increment_func.test b/mysql-test/t/div_precision_increment_func.test
--- a/mysql-test/t/div_precision_increment_func.test 2008-04-10 15:13:50 +02:00
+++ b/mysql-test/t/div_precision_increment_func.test 2008-04-16 16:32:30 +02:00
@@ -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;
diff -Nrup a/mysql-test/t/ssl_ca_basic.test b/mysql-test/t/ssl_ca_basic.test
--- a/mysql-test/t/ssl_ca_basic.test 2008-04-11 21:59:30 +02:00
+++ b/mysql-test/t/ssl_ca_basic.test 2008-04-16 16:32:30 +02:00
@@ -22,7 +22,7 @@
# #
###############################################################################
---source include/have_ssl.inc
+-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_045_01----------------------#'
####################################################################
diff -Nrup a/mysql-test/t/ssl_cert_basic.test b/mysql-test/t/ssl_cert_basic.test
--- a/mysql-test/t/ssl_cert_basic.test 2008-04-11 21:59:31 +02:00
+++ b/mysql-test/t/ssl_cert_basic.test 2008-04-16 16:32:31 +02:00
@@ -22,7 +22,7 @@
# #
###############################################################################
---source include/have_ssl.inc
+-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_047_01----------------------#'
####################################################################
diff -Nrup a/mysql-test/t/ssl_key_basic.test b/mysql-test/t/ssl_key_basic.test
--- a/mysql-test/t/ssl_key_basic.test 2008-04-11 21:59:31 +02:00
+++ b/mysql-test/t/ssl_key_basic.test 2008-04-16 16:32:31 +02:00
@@ -22,7 +22,7 @@
# #
###############################################################################
---source include/have_ssl.inc
+-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_049_01----------------------#'
####################################################################
| Thread |
|---|
| • bk commit into 5.1 tree (hhunger:1.2594) BUG#35988 | horst | 16 Apr |
