Skip to content

M
mariadb
Commit bfdff281 authored by unknown's avatar unknown
Browse files
Options

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

into  hh-nb.hungers:/work/merge/mysql-5.1-build
parents c3e0ed6a 14f753d4
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 13 deletions
mysql-test/r/max_prepared_stmt_count_func.result
View file @ bfdff281
...@@ -78,4 +78,5 @@ DROP PREPARE stmt; ...@@ -78,4 +78,5 @@ DROP PREPARE stmt;
DROP PREPARE stmt1; DROP PREPARE stmt1;
DROP PREPARE stmt2; DROP PREPARE stmt2;
DROP PREPARE stmt3; DROP PREPARE stmt3;
DROP PROCEDURE sp_checkstmts;
SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count; SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count;
mysql-test/t/character_set_client_basic.test
View file @ bfdff281
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc
--source include/have_ucs2.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/character_set_connection_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
################################################### ###################################################
......
mysql-test/t/character_set_database_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
################################################### ###################################################
......
mysql-test/t/character_set_filesystem_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/character_set_results_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
################################################ ################################################
......
mysql-test/t/character_set_server_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/collation_connection_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/collation_database_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/collation_server_basic.test
View file @ bfdff281
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
--source include/have_ujis.inc --source include/have_ujis.inc
--source include/have_sjis.inc --source include/have_sjis.inc
--source include/have_utf8.inc --source include/have_utf8.inc
--source include/have_uds.inc --source include/have_ucs2.inc
--source include/load_sysvars.inc --source include/load_sysvars.inc
......
mysql-test/t/div_precision_increment_func.test
View file @ bfdff281
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
# # # #
################################################################################ ################################################################################
SET @save_div_precision_increment = @@global.div_presision_increment;
--disable_warnings --disable_warnings
drop table if exists t1; drop table if exists t1;
...@@ -118,7 +119,7 @@ drop table t1; ...@@ -118,7 +119,7 @@ drop table t1;
disconnect test_con1; disconnect test_con1;
disconnect test_con2; disconnect test_con2;
SET @@global.div_prescision_increment = @save_div_precision_increment;
......
mysql-test/t/ssl_ca_basic.test
View file @ bfdff281
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# # # #
############################################################################### ###############################################################################
--source include/have_ssl.inc -- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_045_01----------------------#' --echo '#---------------------BS_STVARS_045_01----------------------#'
#################################################################### ####################################################################
......
mysql-test/t/ssl_cert_basic.test
View file @ bfdff281
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# # # #
############################################################################### ###############################################################################
--source include/have_ssl.inc -- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_047_01----------------------#' --echo '#---------------------BS_STVARS_047_01----------------------#'
#################################################################### ####################################################################
......
mysql-test/t/ssl_key_basic.test
View file @ bfdff281
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
# # # #
############################################################################### ###############################################################################
--source include/have_ssl.inc -- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_049_01----------------------#' --echo '#---------------------BS_STVARS_049_01----------------------#'
#################################################################### ####################################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7