diff options
| author | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 15:15:33 +0200 |
|---|---|---|
| committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-12-01 15:15:33 +0200 |
| commit | 5f109f48828c904be4c620fc1d874f3caa305ced (patch) | |
| tree | 3fce0363d69d24e49a8ac48e099d755cd4f6f01c /mysql-test | |
| parent | 2149e3b948450db857ed5e4212e01fc36d0f6df2 (diff) | |
| parent | a1e9b6ba1e7d02c527bd2bd8b0a811919553f09c (diff) | |
| download | mariadb-git-5f109f48828c904be4c620fc1d874f3caa305ced.tar.gz | |
merge of the addenum for bug 37339 to 5.1-bugteam
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/ctype_filesystem.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/ctype_filesystem-master.opt | 2 | ||||
| -rw-r--r-- | mysql-test/t/ctype_filesystem.test | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/ctype_filesystem.result b/mysql-test/r/ctype_filesystem.result index 8a8f0f7f8cc..b461cf2a1a4 100644 --- a/mysql-test/r/ctype_filesystem.result +++ b/mysql-test/r/ctype_filesystem.result @@ -1,7 +1,7 @@ SET CHARACTER SET utf8; SHOW VARIABLES like 'character_sets_dir'; Variable_name Value -character_sets_dir /ß/ +character_sets_dir MYSQL_TEST_DIR/ß/ SHOW VARIABLES like 'character_set_filesystem'; Variable_name Value character_set_filesystem latin1 diff --git a/mysql-test/t/ctype_filesystem-master.opt b/mysql-test/t/ctype_filesystem-master.opt index cb3427571b5..44127f68664 100644 --- a/mysql-test/t/ctype_filesystem-master.opt +++ b/mysql-test/t/ctype_filesystem-master.opt @@ -1,2 +1,2 @@ ---character-sets-dir=/ß +--character-sets-dir=$MYSQL_TEST_DIR/ß --character-set-filesystem=latin1 diff --git a/mysql-test/t/ctype_filesystem.test b/mysql-test/t/ctype_filesystem.test index 30b1607008b..2b993c2b924 100644 --- a/mysql-test/t/ctype_filesystem.test +++ b/mysql-test/t/ctype_filesystem.test @@ -1,4 +1,5 @@ SET CHARACTER SET utf8; +--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR SHOW VARIABLES like 'character_sets_dir'; SHOW VARIABLES like 'character_set_filesystem'; SHOW VARIABLES like 'character_set_client'; |