mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
into hh-nb.hungers:/work/merge/mysql-5.1-build
This commit is contained in:
@ -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 + latin2;
|
||||
##############################################################################
|
||||
# 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;
|
||||
|
@ -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
|
||||
###################################################
|
||||
|
@ -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
|
||||
###################################################
|
||||
|
@ -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 #
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
################################################
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -19,6 +19,8 @@
|
||||
# #
|
||||
################################################################################
|
||||
|
||||
--source include/have_innodb.inc
|
||||
|
||||
--disable_warnings
|
||||
drop table if exists t1;
|
||||
--enable_warnings
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user