#At file:///home/kgeorge/mysql/work/fix-5.0-bugteam/ based on revid:gshchepa@strippedlvao
2728 Georgi Kodinov 2008-12-01
Addendum to bug #37339 : make the test case portable to windows
by using and taking out a full path.
modified:
mysql-test/r/ctype_filesystem.result
mysql-test/t/ctype_filesystem-master.opt
mysql-test/t/ctype_filesystem.test
per-file messages:
mysql-test/r/ctype_filesystem.result
Bug #37399: use MYSQL_TEST_DIR rooted test
mysql-test/t/ctype_filesystem-master.opt
Bug #37399: use MYSQL_TEST_DIR rooted test
mysql-test/t/ctype_filesystem.test
Bug #37399: use MYSQL_TEST_DIR rooted test
=== modified file 'mysql-test/r/ctype_filesystem.result'
--- a/mysql-test/r/ctype_filesystem.result 2008-11-28 14:25:16 +0000
+++ b/mysql-test/r/ctype_filesystem.result 2008-12-01 11:34:53 +0000
@@ -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
=== modified file 'mysql-test/t/ctype_filesystem-master.opt'
--- a/mysql-test/t/ctype_filesystem-master.opt 2008-11-28 14:25:16 +0000
+++ b/mysql-test/t/ctype_filesystem-master.opt 2008-12-01 11:34:53 +0000
@@ -1,2 +1,2 @@
---character-sets-dir=/�+--character-sets-dir=$MYSQL_TEST_DIR/� --character-set-filesystem=latin1
=== modified file 'mysql-test/t/ctype_filesystem.test'
--- a/mysql-test/t/ctype_filesystem.test 2008-11-28 14:25:16 +0000
+++ b/mysql-test/t/ctype_filesystem.test 2008-12-01 11:34:53 +0000
@@ -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';
| Thread |
|---|
| • bzr commit into mysql-5.0-bugteam branch (kgeorge:2728) Bug#37339 | Georgi Kodinov | 1 Dec |