List:Commits« Previous MessageNext Message »
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
View as plain text  
 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
 


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20101119140100-u9d84cafs8f48tm7.bundle
Thread
bzr push into mysql-5.5-bugteam branch (chris.powers:3129 to 3130) Bug#35333Christopher Powers19 Nov