summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-01-14 07:56:05 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-01-14 07:56:05 +0000
commit1beac3a131b86b8e184f739d3c03fa42292fb5e0 (patch)
tree0b92db941d5aeb432098a5b83ada7b0435e5c20f
parentReworked 07110 patch for mysql-5.1.42. (diff)
downloadmysql-extras-1beac3a131b86b8e184f739d3c03fa42292fb5e0.tar.gz
mysql-extras-1beac3a131b86b8e184f739d3c03fa42292fb5e0.tar.bz2
mysql-extras-1beac3a131b86b8e184f739d3c03fa42292fb5e0.zip
Fix mysql_comments testcase for charset fun.
-rw-r--r--00000_index.txt6
-rw-r--r--07250_all_testcase_latin1_fix-5.1.42.patch16
2 files changed, 22 insertions, 0 deletions
diff --git a/00000_index.txt b/00000_index.txt
index 054e501..f8932b0 100644
--- a/00000_index.txt
+++ b/00000_index.txt
@@ -546,6 +546,12 @@ W@patch 00100_all_mysql-4.0-my-print-defaults.patch
@pn mysql-community
@@ Fix LDFLAGS inclusion in the mysql_config libs output for --as-needed usage.
+@patch 07250_all_testcase_latin1_fix-5.1.42.patch
+@ver 5.01.41.00 to 5.01.99.99
+@pn mysql
+@@ Latin1 is assumed by the testsuite even with --with-charset=utf8
+@@ is passed to configure.
+
@patch 10010_all_show_patches-percona-5.0.75-b12.patch
@ver 5.00.75.00 to 5.00.76.99
@pn mysql-community
diff --git a/07250_all_testcase_latin1_fix-5.1.42.patch b/07250_all_testcase_latin1_fix-5.1.42.patch
new file mode 100644
index 0000000..648dd92
--- /dev/null
+++ b/07250_all_testcase_latin1_fix-5.1.42.patch
@@ -0,0 +1,16 @@
+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.
+
+--- a/mysql-test/t/mysql_comments.test 2010-01-13 23:43:19.536708462 -0800
++++ b/mysql-test/t/mysql_comments.test 2010-01-13 23:42:58.976834177 -0800
+@@ -24,6 +24,7 @@
+ drop procedure if exists nicesp;
+ drop trigger if exists t1_empty;
+ drop trigger if exists t1_bi;
++set names 'latin1';
+ --enable_warnings
+
+ # Test without comments