bzr push into mysql-5.1-bugteam branch (chris.powers:3526 to 3527) Bug#35333

[Christopher Powers]

 3527 Christopher Powers	2010-11-30
      Bug#35333, "If Federated table can't connect to remote host, can't retrieve metadata"
     @ mysql-test/r/show_check.result
        Fixed corrupted result file

    modified:
      mysql-test/r/show_check.result
 3526 Christopher Powers	2010-11-29
      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/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.
     @ 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/merge.result
      mysql-test/r/show_check.result
      mysql-test/r/view.result
      sql/sql_show.cc
=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2010-11-30 04:46:43 +0000
+++ b/mysql-test/r/show_check.result	2010-11-30 15:43:50 +0000
@@ -1198,7 +1198,7 @@ set names koi8r;
 DROP DATABASE IF EXISTS mysqltest1;
 CREATE DATABASE mysqltest1;
 use mysqltest1;
-CREATE TABLE t1(�������1 INT);
+CREATE TABLE t1(���� INT);
 
 ---> Dumping mysqltest1 to outfile1
 
@@ -1210,7 +1210,7 @@ DROP DATABASE mysqltest1;
 SHOW CREATE TABLE mysqltest1.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `�` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 DROP DATABASE mysqltest1;
 use test;
@@ -1417,14 +1417,14 @@ DROP PROCEDURE IF EXISTS p1;
 DROP FUNCTION IF EXISTS f1;
 DROP TABLE IF EXISTS t1;
 DROP EVENT IF EXISTS ev1;
-CREATE VIEW v1 AS SELECT '����' AS test;
-CREATE PROCEDURE p1() SELECT '����' AS test;
-CREATE FUNCTION f1() RETURNS CHAR(10) RETURN '����';
+CREATE VIEW v1 AS SELECT '��' AS test;
+CREATE PROCEDURE p1() SELECT '��' AS test;
+CREATE FUNCTION f1() RETURNS CHAR(10) RETURN '��';
 CREATE TABLE t1(c1 CHAR(10));
 CREATE TRIGGER t1_bi BEFORE INSERT ON t1
 FOR EACH ROW
-SET NEW.c1 = '����';
-CREATE EVENT ev1 ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT '��ON SCHEDULE AT '2030-01-01 00:00:00' DO SELECT '��' AS test;
 set names utf8;
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection

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