From: Christopher Powers Date: November 19 2010 2:01pm Subject: bzr push into mysql-5.5-bugteam branch (chris.powers:3129 to 3130) Bug#35333 List-Archive: http://lists.mysql.com/commits/124481 X-Bug: 35333 Message-Id: <20101119140113.859F01DB0311@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6137253240407732438==" --===============6137253240407732438== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 3129 Christopher Powers 2010-11-18 Bug#35333, "If Federated table can't connect to remote host, can't retrieve metadata" Improved error handling such that queries against Information_Schema.Tables won't fail if a federated table can't make a remote connection. @ mysql-test/r/lock_multi.result Updated with warnings that were previously masked. @ mysql-test/r/mdl_sync.result Updated with warnings that were previously masked. @ mysql-test/r/merge.result Updated with warnings that were previously masked. @ mysql-test/r/show_check.result Updated with warnings that were previously masked. @ mysql-test/r/view.result Updated with warnings that were previously masked. @ mysql-test/suite/federated/federated_bug_35333.result Changes per code review. @ mysql-test/suite/federated/federated_bug_35333.test Changes per code review. @ sql/sql_show.cc If get_schema_tables_record() encounters an error, push a warning, set the TABLE COMMENT column with the error text, and clear the error so that the operation can continue. modified: mysql-test/r/lock_multi.result mysql-test/r/mdl_sync.result mysql-test/r/merge.result mysql-test/r/show_check.result mysql-test/r/view.result mysql-test/suite/federated/federated_bug_35333.result mysql-test/suite/federated/federated_bug_35333.test sql/sql_show.cc === modified file 'mysql-test/suite/federated/federated_bug_35333.result' --- a/mysql-test/suite/federated/federated_bug_35333.result 2010-11-18 19:56:42 +0000 +++ b/mysql-test/suite/federated/federated_bug_35333.result 2010-11-19 14:01:00 +0000 @@ -7,7 +7,7 @@ # The fix is to store the error text in the TABLE COMMENTS column of I_S.TABLES, clear # the remote connection error and push a warning instead. This allows the SELECT operation # to complete while still indicating a problem. This fix applies to any non-fatal system -# error that occurs during a query against I_S.TABLES. +# error that occurs during a query against I_S.TABLES.de CREATE DATABASE federated; CREATE DATABASE federated; CREATE DATABASE IF NOT EXISTS realdb; @@ -43,7 +43,6 @@ CREATE TABLE t1 (c1 int) ENGINE=MYISAM; # # Corrupt the MyISAM table by deleting the base file # -/home/cpowers/work/dev/mysql-5.5-bugteam/mysql-test/var/mysqld.2/data/ # # Trigger a MyISAM system error during an INFORMATION_SCHEMA.TABLES query # === modified file 'mysql-test/suite/federated/federated_bug_35333.test' --- a/mysql-test/suite/federated/federated_bug_35333.test 2010-11-18 19:56:42 +0000 +++ b/mysql-test/suite/federated/federated_bug_35333.test 2010-11-19 14:01:00 +0000 @@ -7,7 +7,7 @@ --echo # The fix is to store the error text in the TABLE COMMENTS column of I_S.TABLES, clear --echo # the remote connection error and push a warning instead. This allows the SELECT operation --echo # to complete while still indicating a problem. This fix applies to any non-fatal system ---echo # error that occurs during a query against I_S.TABLES. +--echo # error that occurs during a query against I_S.TABLES.de --source federated.inc @@ -48,7 +48,6 @@ CREATE TABLE t1 (c1 int) ENGINE=MYISAM; --echo # Corrupt the MyISAM table by deleting the base file --echo # let $MYSQLD_DATADIR= `SELECT @@datadir`; ---echo $MYSQLD_DATADIR --remove_file $MYSQLD_DATADIR/realdb/t1.MYD --remove_file $MYSQLD_DATADIR/realdb/t1.MYI --===============6137253240407732438== 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: 7a7644d33690a15933b75ed20f806f954c149f78 # timestamp: 2010-11-19 08:01:13 -0600 # base_revision_id: chris.powers@stripped\ # 7p154b6frn4yk5eo # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaBOxvoAAjTfgAARWOf/93sk XAC/7//wUAS48ACgMqeVGElNUyaajNCNkaGmQgxkgZME09BzAATAAEwAAAAAEoKMijxTyMmpiaaB oGgaPUHqACKST1T2lGammQyaaAA9QGQAaASUE00aGgIJqn4p6bVT8qfokZB6m0jTJbkz7RcL8qrf Hfchc1zWLTSJTKyGY4Rnokdqwa2uio2k4oimG5MXgoOtTtSpSrq6mO6Yx9D9NFkuExxEpJ7RZ4Ll HN5jAukdKI/DhEljWWDk5ZrNdvWj6WpHBt/kNpslCzexmoYoXD3+CVH5yLZbT38tAHF4NKvY4CTD kkqDMlVA2k/GlKTCTWjAZYBvc4DAKX2RAcgIwEDzq2oGm3rxoiELbPSwIKtTPceRopJYG4xFg0xI vDo1ArmfLgb/yegLkA58H3Tlg8zMgNAtVH1lnW5G4i4qr134INWAXokNJl5G0y0so2lyH6bUBUFY 1/c3Umyp06ieDEXGBXpJUDGgWJxHg9KxKriU9vqKygvLbTMjcCpMqLiCORBT6mGMm0NhXjcMLgMi m5lCoRMC99Iym4+CLW1+Zw3XvZAzpS5tJI5o4c0UkygwliKh9QwhzQ7fVGvOPMdQV0kkXbSdIbJm 5DjM2nklswyMdDeOyL9C+m0L77WtJoqjfHEYE3j3IaZ0EgKchsLaifECsDIfWsSIFLEY0lw2Uig3 T/0BlE9CvBXEra/MsKmRZFBYrIkyEIrXsTZkJ85YjjsdPkcNol/hSVjGMYz+T27jvcmpcBsexE1P UXuYCkZMMxiMO7hWDOLhanGqgwy/HJ/Q7d/Ak+/oQKSkC8wijM9cyuUT7FPc8TS6bRmkEFTuWpmb +yNDsZHYb4C84aeYvTUCPSMSbiculHleByJ/M9cjks84I9DVMG/S2DBLuJPsjcMWgw2a/Gt5cGpA NAHdoIgLScy5r0Gq+5TtgeZqdk37tAMSH6XcDmPWpeeDuOxtaNaWEkeHT7bcONCwGC+1gHLfnkzB ilrj6uk5MXKa/Bl5JwQIjjxWmQacpmSU+omoihB1zYMzzkPIsbX1NSBoIzMwzBLQMqimpzlDsGpv qoqNy/B1aQceqHYATKIG8B4HoNpIdhnIXkVcXymMJVzF4JYSxOOv3sSHPvULCY0niLei3ASH/Lgf jRAS7IZvPN512n0Rmj5mW4KUUtDM14FYkxGV9xWVcj4iXzN4DclUrtLN7NKaCEA4EHFBFDRqiZiq aZ5ya5SLFiAhwm3db0l8wUSNxWxLpVFcH6LJNd5pOxjtj+mLK1N83jDuwQE2hXoFxzuIm01JK8mW myFo1MSDk1A96VrbOTVxIfDTAsS33Al6J4shRoQrXBDUyzC9ZQC8LZi1tnPDYVIYQDPwdVHmMLmL KqtFY9uy0/DKnDufWgooYZA4dEkxxkWwtOsRGNXlYNBjB8dLz4gUWimpsgwLdgGzicfZiVRmyAyB oSnJNRgOSTjcQOxBF1EhQjOpzDgUHcXckU4UJCgTsb6A --===============6137253240407732438==--