From: Christopher Powers Date: November 22 2010 10:13pm Subject: bzr push into mysql-5.5-bugteam branch (chris.powers:3130 to 3131) Bug#35333 List-Archive: http://lists.mysql.com/commits/124692 X-Bug: 35333 Message-Id: <20101122221332.58E841DB031B@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1713898260527161667==" --===============1713898260527161667== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3130 Christopher Powers 2010-11-19 Bug#35333, "If Federated table can't connect to remote host, can't retrieve metadata" Removed debug statement from test files. 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 # --===============1713898260527161667== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/mysql-5.5-bugteam/ # testament_sha1: 0cc888d9cf7b735f9981cc383ff2c83a9bebbd86 # timestamp: 2010-11-22 16:13:31 -0600 # base_revision_id: chris.powers@stripped\ # u9d84cafs8f48tm7 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcC9Kz0AAsffgEAwWPf/938n /oS////wUAWs8ADpu67R3vONUoglEEmk9T0Q2p6T1NoT0ag9T1PU0NGQaAaBoJKiPRlBtTJGTCZq BkMQZqYjTTQaADEjUI09KNMmmho9QABkMgGgD1ADakQU8TEnoyhtJ6jIA0AAaaAAAkkmEaAmjVP1 PRGmpPyTJo9I1ND1Bo0NpNGm4B3UcekvUwsnNEc89BITKvrhJyDFePgtseXNpsrhRCqw0A9qLM0W 2PUz4jdH4PAWwkikZvICyNECtLfwPFaAZnRiqlhms4T56p2xUMWtvCt8MxnKvlAiIgfb9hNtCtfQ ZxKly5Laj+VU8IKpMD9eWg8mUaD6vBFHrcg4HbFPWxHyHB2la4MPPAvvrO6sYaAvohcvp3KNivn6 Nh5xA8Tf8kVmiJHiaxd6elUViXcJQDmG0+KGNV0g3lpivfM0qQubr0bRPoRmKEZo6EggCKCz2TF7 ew50izzAxU7AsVdJ5lj9i6TGpkMzOH61ipdrALHpL+uZBIKqWSIRyoA96qlRHCLz4APOiCPWG0/N c7Xl4G7dSWQuyPDTN4vBkb77KN7TMmqLNRo8pA3LaxNYJBSJq4gDAVhucm3jsGRkXjSN5EsaLNlF IeixlAgBQQgkWpF0jiePmI9uZAxLC2gLidbiHC3ApUiseMiIlVWdHetluvoA4GCL675Dthio8EPN 5qlDEz71vpA6X/4BDFSSHW6jD0odfGSYuFMbN0H6UOou4LU6lWaXJyIe6fjtgVyaaaBTvBg1rFaV QDGRK8sLpDbKGrIDXeWmqacDQOuDLYNMyNHmFOSYVU0ZgWufa4qumV0nUhkYFrMPmhh7ujbeUXSu 1N9UaqwBplpSY22cNSDciFeD1KKgUVKeiADhoJjaItQrLYlUZbJi+jRSfMSSiJrv64dsUVRavPTk 3UVhoztq7tlR0rd6f8sUUAqqrQj7KLFClGUt7lGRm42COIRvhMpgFRJulogoZTCwoxjymqDY6JKj NnER1yOK7zRgpI+Eqyr5qR8CVphcl9TvLgiAPKOOsx9pkWynBZGGceHJpEeGFBGhxQoCTvz4EYiW EtKQowBZgjkeCYd870Ux8hDhLyEo3JRSMNQ4LzHXyj1nkXLEOKnxqDyRDQkiIjhgtfAZ4BxX2Us+ 1Q+xeqHOBDjj7LjIoKChWZ9heu87i2CrcxYE0SPZHiEhIXiMBL3aGAAudqBMq9lnv0pBxwClHanr SsdBnGKRkYHGXVocklTchXAVvLrSMTNMtCFiTmvVDAQIO/JMXCTDETHW3IMHijuAtZXpTYc6V1MY xWKsJUSAVkEIpgPspGINal1DmRryxEHARGwD3KxYgR2Kfetw7gK304TUBL7+BrSwmcAH8Tch2W42 MhpP5KxE1tVSCJfyRdOw8+nZDJF4B2obQOx57tANYLJHFbFkEkScv6pPQX93SMmsEmDJVfJ1e2Dn EXGMWk+scpybG1kWBKKJFqgIpSETxhl8VUdSfFHUlFwU2FCTIrE9gZajK8R3FQn0JLWQpLAKSUWZ 4QKVl+IHCkQ8xPOOzTvFhQvtIStKIG1R6GGE9PRSaAZFX4iXopzA5li0OxWI2LFXFoRZOSDrcAWL 7h6xilaXlF/ByqUslhOBMTLUFBDheKMFEmQMzMMOsQZk5VIYSp1qVF9ybUxYTQxSGz1IkBzKUfFF YXsKdaPAsHlGOZ5g8Q3Wlj6m4sftTQZg8oCkxajNYYEmOVIq2ESz6siA6wHRU9NZ4oiImLBYfIdG yVM4rc+QFIlhZQpqAmaQlHivkAECerVMcSeKMrP43RZVZUR/4u5IpwoSGBelZ6A= --===============1713898260527161667==--