mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
This commit is contained in:
hhunger@hh-nb.hungers 2008-04-16 16:49:49 +02:00
commit a14e5f3707
14 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/r/max_prepared_stmt_count_func.result
View file

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

1
mysql-test/t/character_set_client_basic.test
View file

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

2
mysql-test/t/character_set_connection_basic.test
View file

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

2
mysql-test/t/character_set_database_basic.test
View file

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

2
mysql-test/t/character_set_filesystem_basic.test
View file

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

2
mysql-test/t/character_set_results_basic.test
View file

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

2
mysql-test/t/character_set_server_basic.test
View file

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

2
mysql-test/t/collation_connection_basic.test
View file

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

2
mysql-test/t/collation_database_basic.test
View file

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

2
mysql-test/t/collation_server_basic.test
View file

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

3
mysql-test/t/div_precision_increment_func.test
View file

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

2
mysql-test/t/ssl_ca_basic.test
View file

@ -22,7 +22,7 @@
# #
###############################################################################
--source include/have_ssl.inc
-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_045_01----------------------#'
####################################################################

2
mysql-test/t/ssl_cert_basic.test
View file

@ -22,7 +22,7 @@
# #
###############################################################################
--source include/have_ssl.inc
-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_047_01----------------------#'
####################################################################

2
mysql-test/t/ssl_key_basic.test
View file

@ -22,7 +22,7 @@
# #
###############################################################################
--source include/have_ssl.inc
-- source include/have_ssl.inc
--echo '#---------------------BS_STVARS_049_01----------------------#'
####################################################################