bzr push into mysql-5.5-bugteam branch (chris.powers:3151 to 3152)

[Christopher Powers]

 3152 Christopher Powers	2010-11-30 [merge]
      Null-merge from mysql-5.1-bugteam

 3151 Christopher Powers	2010-11-30
      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
        New test results for bug#35333
     @ mysql-test/suite/federated/federated_bug_35333.test
        New test or bug#35333
     @ 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.

    added:
      mysql-test/suite/federated/federated_bug_35333.result
      mysql-test/suite/federated/federated_bug_35333.test
    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
      sql/sql_show.cc

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