bzr commit into mysql-5.5-bugteam branch (chris.powers:3131) Bug#35333

[Christopher Powers]

#At file:///home/cpowers/work/dev/mysql-5.5-bugteam/ based on revid:chris.powers@stripped

 3131 Christopher Powers	2010-11-22
      Bug#35333, "If Federated table can't connect to remote host, can't retrieve metadata"
      
      Removed O/S-specific socket errors
     @ mysql-test/suite/federated/federated_bug_35333.result
        Strip out O/S-specific socket errors
     @ mysql-test/suite/federated/federated_bug_35333.test
        Strip out O/S-specific socket errors

    modified:
      mysql-test/suite/federated/federated_bug_35333.result
      mysql-test/suite/federated/federated_bug_35333.test
=== modified file 'mysql-test/suite/federated/federated_bug_35333.result'
--- a/mysql-test/suite/federated/federated_bug_35333.result	2010-11-19 14:01:00 +0000
+++ b/mysql-test/suite/federated/federated_bug_35333.result	2010-11-22 22:13:15 +0000
@@ -28,13 +28,13 @@ CONNECTION='mysql://root@stripped:63333
 SELECT TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, TABLE_ROWS, DATA_LENGTH, TABLE_COMMENT
 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'realdb' or TABLE_SCHEMA = 'federated';
 TABLE_SCHEMA	TABLE_NAME	TABLE_TYPE	ENGINE	ROW_FORMAT	TABLE_ROWS	DATA_LENGTH	TABLE_COMMENT
-federated	t0	BASE TABLE	FEDERATED		NULL	0	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (111)
+federated	t0	BASE TABLE	FEDERATED		NULL	0	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
 realdb	t0	BASE TABLE	MyISAM	Dynamic	0	0	
 Warnings:
-Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (111)
+Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (111)
+Warning	1429	Unable to connect to foreign data source: Can't connect to MySQL server on '127.0.0.1' (socket errno)
 #
 # Create a MyISAM table then corrupt the file
 #

=== modified file 'mysql-test/suite/federated/federated_bug_35333.test'
--- a/mysql-test/suite/federated/federated_bug_35333.test	2010-11-19 14:01:00 +0000
+++ b/mysql-test/suite/federated/federated_bug_35333.test	2010-11-22 22:13:15 +0000
@@ -34,9 +34,13 @@ CREATE TABLE federated.t0 (a text, b tex
 --echo #
 --echo # Trigger a federated system error during a INFORMATION_SCHEMA.TABLES query
 --echo #
+# Remove O/S-specific socket error
+--replace_regex /\(.*\)/(socket errno)/
 SELECT TABLE_SCHEMA, TABLE_NAME, TABLE_TYPE, ENGINE, ROW_FORMAT, TABLE_ROWS, DATA_LENGTH, TABLE_COMMENT
        FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'realdb' or TABLE_SCHEMA = 'federated';
 
+# Remove O/S-specific socket error
+--replace_regex /\(.*\)/(socket errno)/
 SHOW WARNINGS;
 
 --echo #


Attachment: [text/bzr-bundle] bzr/[e-mail]