diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-01-20 16:59:20 +0100 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-01-20 16:59:20 +0100 |
| commit | 237ef78e1cd978c545b27179fa51cd6ff022210c (patch) | |
| tree | 4e9c3c98ed57ca85f0479fba1d478a568bce38eb /mysql-test | |
| parent | 75e1ed96180cc96721ebb32946001c4b84aabda9 (diff) | |
| download | mariadb-git-237ef78e1cd978c545b27179fa51cd6ff022210c.tar.gz | |
Adding a test to verify that Bug#27208 "If no current database,
character_set_database !=character_set_server" is fixed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/character_set_database_func.result | 10 | ||||
| -rw-r--r-- | mysql-test/t/character_set_database_func.test | 21 |
2 files changed, 31 insertions, 0 deletions
diff --git a/mysql-test/r/character_set_database_func.result b/mysql-test/r/character_set_database_func.result index 95b65eacfd2..60628c30187 100644 --- a/mysql-test/r/character_set_database_func.result +++ b/mysql-test/r/character_set_database_func.result @@ -2,6 +2,7 @@ SET @global_character_set_database = @@global.character_set_database; SET @session_character_set_database = @@session.character_set_database; SET @session_character_set_server = @@session.character_set_server; +SET @global_character_set_server = @@global.character_set_server; SET @@global.character_set_database = utf8; 'connect (con1,localhost,root,,,,)' 'connection con1' @@ -71,6 +72,15 @@ SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1; count(*) 1 DROP TABLE IF EXISTS t1; +'Bug#27208: If no current database, character_set_database !=character_set_server' +SET GLOBAL character_set_server=latin5; +CREATE DATABASE csdb CHARACTER SET = utf8; +USE csdb; +DROP DATABASE csdb; +SELECT @@character_set_database; +@@character_set_database +latin5 SET @@global.character_set_database = @global_character_set_database; SET @@session.character_set_database = @session_character_set_database; SET @@session.character_set_server = @session_character_set_server; +SET @@global.character_set_server = @global_character_set_server; diff --git a/mysql-test/t/character_set_database_func.test b/mysql-test/t/character_set_database_func.test index b2d2d017d64..5ba8669c816 100644 --- a/mysql-test/t/character_set_database_func.test +++ b/mysql-test/t/character_set_database_func.test @@ -29,6 +29,7 @@ SET @global_character_set_database = @@global.character_set_database; SET @session_character_set_database = @@session.character_set_database; SET @session_character_set_server = @@session.character_set_server; +SET @global_character_set_server = @@global.character_set_server; SET @@global.character_set_database = utf8; --echo 'connect (con1,localhost,root,,,,)' @@ -106,10 +107,30 @@ SELECT count(*) FROM t1 WHERE CHAR_LENGTH(a)>1; DROP TABLE IF EXISTS t1; --enable_warnings + +#============================================================================== +--echo 'Bug#27208: If no current database, character_set_database !=character_set_server' +#============================================================================== + +SET GLOBAL character_set_server=latin5; + +connect (con2, localhost, root,,); +connection con2; + +CREATE DATABASE csdb CHARACTER SET = utf8; +USE csdb; +DROP DATABASE csdb; +SELECT @@character_set_database; + +connection default; +disconnect con2; + + #restore SET @@global.character_set_database = @global_character_set_database; SET @@session.character_set_database = @session_character_set_database; SET @@session.character_set_server = @session_character_set_server; +SET @@global.character_set_server = @global_character_set_server; ############################################################ # End of functionality Testing for character_set_database # ############################################################ |