blob: b63318fab17cf19902c64f928d0489a63450c4e5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
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,
|
GitWeb
