diff options
author | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-28 16:25:16 +0200 |
---|---|---|
committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-11-28 16:25:16 +0200 |
commit | 8e688a7a0246d16a8c636262872a6e7b06376b99 (patch) | |
tree | ccbb2ba3445b26b5118941e5368b749d28786b81 /mysql-test/r/ctype_filesystem.result | |
parent | 380f1a84403a88b4b45f3d14fe98882a04c4773d (diff) | |
download | mariadb-git-8e688a7a0246d16a8c636262872a6e7b06376b99.tar.gz |
Bug #37339: SHOW VARIABLES not working properly with multi-byte datadir
The SHOW VARIABLES LIKE .../SELECT @@/SELECT ... FROM INFORMATION_SCHEMA.VARIABLES
were assuming that all the system variables are in system charset (UTF-8).
However the variables that are settable through command line will have a different
character set (character_set_filesystem).
Fixed the server to remember the correct character set of basedir, datadir, tmpdir,
ssl, plugin_dir, slave_load_tmpdir, innodb variables; init_connect and init_slave
variables and use it when processing data.
mysql-test/r/ctype_filesystem.result:
Bug #37339: test case (should be in utf-8)
mysql-test/t/ctype_filesystem-master.opt:
Bug #37339: test case (should be in ISO-8859-1)
mysql-test/t/ctype_filesystem.test:
Bug #37339: test case
sql/mysqld.cc:
Bug #37339: remember the correct character set for init_slave and init_connect
sql/set_var.cc:
Bug #37339:
- remember the character set of the relevant variables
- implement storing and using the correct
character set
sql/set_var.h:
Bug #37339: implement storing and using the correct
character set
sql/sql_show.cc:
Bug #37339: implement storing and using the correct
character set
Diffstat (limited to 'mysql-test/r/ctype_filesystem.result')
-rw-r--r-- | mysql-test/r/ctype_filesystem.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/ctype_filesystem.result b/mysql-test/r/ctype_filesystem.result new file mode 100644 index 00000000000..8a8f0f7f8cc --- /dev/null +++ b/mysql-test/r/ctype_filesystem.result @@ -0,0 +1,11 @@ +SET CHARACTER SET utf8; +SHOW VARIABLES like 'character_sets_dir'; +Variable_name Value +character_sets_dir /ß/ +SHOW VARIABLES like 'character_set_filesystem'; +Variable_name Value +character_set_filesystem latin1 +SHOW VARIABLES like 'character_set_client'; +Variable_name Value +character_set_client utf8 +SET CHARACTER SET default; |