Merge lp:~percona-dev/percona-server/fix-mysql_mysql_upgrade into lp:percona-server/release-5.1.47-11

[Aleksandr Kuzminsky]

Fixed:
Bug #588179: main.mysql fails on 11.0
Bug #588182: main.mysql_upgrade fails on 11.0

[Aleksandr Kuzminsky (akuzminsky)]

The tests passed:
http://test9.gni.percona.com:5926/builders/CentOS_5_x86_64/builds/8/steps/shell_3/logs/stdio

[Yasufumi Kinoshita (yasufumi-kinoshita)]

The script is not needed in my environment... Is it CentOS5 specific?

[Yasufumi Kinoshita (yasufumi-kinoshita)]

(not needed to be patched)

[Yasufumi Kinoshita (yasufumi-kinoshita)]

Anyway I cannot accept but the fix makes main.mysql fails in my environment...

review: Needs Information

Unmerged revisions

23. By Aleksandr Kuzminsky on 2010-06-01

fix of the fix. bug #588182 and #588179

22. By Aleksandr Kuzminsky on 2010-06-01

Fixed Bug #588182 and Bug #588179

=== modified file 'mysql-test.diff'
--- mysql-test.diff	2010-05-28 05:38:53 +0000
+++ mysql-test.diff	2010-06-02 04:17:22 +0000
@@ -928,3 +928,36 @@
  --error 1118
  CREATE TABLE t1 (
  	c01 CHAR(255), c02 CHAR(255), c03 CHAR(255), c04 CHAR(255),
+--- a/mysql-test/r/mysql.result      2010-02-11 04:11:48.000000000 -0500
++++ b/mysql-test/r/mysql.result   2010-02-11 04:18:24.000000000 -0500
+@@ -162,8 +162,8 @@
+ ERROR 1049 (42000) at line 1: Unknown database 'invalid'
+ Test connect with dbname + hostname
+ Test connect with dbname + _invalid_ hostname
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno)
+ The commands reported in the bug report
+ ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ Too long dbname
+@@ -198,7 +198,7 @@
+ 1
+ COUNT (*)
+ 1
+-ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
++ERROR 2003 (HY000) at line 1: Can't connect to MySQL server on 'invalid_hostname' (errno)
+ End of 5.0 tests
+ WARNING: --server-arg option not supported in this configuration.
+ Warning (Code 1286): Unknown table engine 'nonexistent'
+--- a/mysql-test/r/mysql_upgrade.result      2010-02-13 16:51:51.000000000 -0500
++++ b/mysql-test/r/mysql_upgrade.result   2010-02-13 16:52:07.000000000 -0500
+@@ -94,7 +94,7 @@
+ mysql.user                                         OK
+ DROP USER mysqltest1@'%';
+ Run mysql_upgrade with a non existing server socket
+-mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errno) when trying to connect
++mysqlcheck: Got error: 2003: Can't connect to MySQL server on 'not_existing_host' (errno) when trying to connect
+ FATAL ERROR: Upgrade failed
+ set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE';
+ mtr.global_suppressions                            OK