diff options
| author |   Robin H. Johnson <robbat2@orbis-terrarum.net> | 2010-01-14 00:10:56 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@orbis-terrarum.net> | 2010-01-14 00:10:56 -0800 |
| commit | 51ce5992d3d9692854b1e6ecdb22a7c100ffe920 (patch) | |
| tree | 8c67cd8605ca861d2cc6dc17f68e37a5b0c08cc3 /07260_all_testsuite_mtr_latin1_fix-5.1.42.patch | |
| parent | Fix mysql_comments testcase for charset fun. (diff) | |
| download | mysql-extras-51ce5992d3d9692854b1e6ecdb22a7c100ffe920.tar.gz mysql-extras-51ce5992d3d9692854b1e6ecdb22a7c100ffe920.tar.bz2 mysql-extras-51ce5992d3d9692854b1e6ecdb22a7c100ffe920.zip | |
Another charset fixup patch and include S-O-B header.
Diffstat (limited to '07260_all_testsuite_mtr_latin1_fix-5.1.42.patch')
| -rw-r--r-- | 07260_all_testsuite_mtr_latin1_fix-5.1.42.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/07260_all_testsuite_mtr_latin1_fix-5.1.42.patch b/07260_all_testsuite_mtr_latin1_fix-5.1.42.patch new file mode 100644 index 0000000..b63318f --- /dev/null +++ b/07260_all_testsuite_mtr_latin1_fix-5.1.42.patch @@ -0,0 +1,48 @@ +Some parts of the testsuite blindly assume that the default charset and +collation are latin1. + +Gentoo however builds with --with-charset=utf8 --with-collation=utf8_general_ci +unless USE=latin1 is explicitly selected. + +This patch primarily fixes the 'information_schema' test, but may also affect +the results of other tests that did not implicitly request a specific charset +or collation. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar mysql-5.1.42.orig/mysql-test/mtr mysql-5.1.42/mysql-test/mtr +--- mysql-5.1.42.orig/mysql-test/mtr 2009-12-16 09:54:52.000000000 -0800 ++++ mysql-5.1.42/mysql-test/mtr 2010-01-14 00:05:57.542708718 -0800 +@@ -2801,7 +2801,7 @@ + + # Create mtr database + mtr_tofile($bootstrap_sql_file, +- "CREATE DATABASE mtr;\n"); ++ "CREATE DATABASE mtr CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';\n"); + + # Add help tables and data for warning detection and supression + mtr_tofile($bootstrap_sql_file, +diff -Nuar mysql-5.1.42.orig/mysql-test/mysql-test-run mysql-5.1.42/mysql-test/mysql-test-run +--- mysql-5.1.42.orig/mysql-test/mysql-test-run 2009-12-16 09:54:52.000000000 -0800 ++++ mysql-5.1.42/mysql-test/mysql-test-run 2010-01-14 00:06:02.118833474 -0800 +@@ -2801,7 +2801,7 @@ + + # Create mtr database + mtr_tofile($bootstrap_sql_file, +- "CREATE DATABASE mtr;\n"); ++ "CREATE DATABASE mtr CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';\n"); + + # Add help tables and data for warning detection and supression + mtr_tofile($bootstrap_sql_file, +diff -Nuar mysql-5.1.42.orig/mysql-test/mysql-test-run.pl mysql-5.1.42/mysql-test/mysql-test-run.pl +--- mysql-5.1.42.orig/mysql-test/mysql-test-run.pl 2009-12-16 09:54:52.000000000 -0800 ++++ mysql-5.1.42/mysql-test/mysql-test-run.pl 2010-01-14 00:06:14.390833637 -0800 +@@ -2801,7 +2801,7 @@ + + # Create mtr database + mtr_tofile($bootstrap_sql_file, +- "CREATE DATABASE mtr;\n"); ++ "CREATE DATABASE mtr CHARACTER SET 'latin1' COLLATE 'latin1_swedish_ci';\n"); + + # Add help tables and data for warning detection and supression + mtr_tofile($bootstrap_sql_file, |