summaryrefslogtreecommitdiff
path: root/mysql-test/r/merge.result
diff options
context:
space:
mode:
authorChristopher Powers <chris.powers@oracle.com>2010-11-30 11:20:56 -0600
committerChristopher Powers <chris.powers@oracle.com>2010-11-30 11:20:56 -0600
commit8f3d884dd2116fa37221bbbc9704ff27d07518e0 (patch)
tree5d419d95f834e4929e57f238163508198163c262 /mysql-test/r/merge.result
parent7009fd0e7d72327d11c53b180f05e80d64eff522 (diff)
downloadmariadb-git-8f3d884dd2116fa37221bbbc9704ff27d07518e0.tar.gz
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.
Diffstat (limited to 'mysql-test/r/merge.result')
-rw-r--r--mysql-test/r/merge.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/merge.result b/mysql-test/r/merge.result
index ace834a26c2..f668761cb16 100644
--- a/mysql-test/r/merge.result
+++ b/mysql-test/r/merge.result
@@ -2084,6 +2084,8 @@ SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE
TABLE_SCHEMA = 'test' and TABLE_NAME='tm1';
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME TABLE_TYPE ENGINE VERSION ROW_FORMAT TABLE_ROWS AVG_ROW_LENGTH DATA_LENGTH MAX_DATA_LENGTH INDEX_LENGTH DATA_FREE AUTO_INCREMENT CREATE_TIME UPDATE_TIME CHECK_TIME TABLE_COLLATION CHECKSUM CREATE_OPTIONS TABLE_COMMENT
def test tm1 BASE TABLE NULL NULL NULL # # # # # # # # # # NULL # # Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
+Warnings:
+Warning 1168 Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
DROP TABLE tm1;
CREATE TABLE t1(C1 INT, C2 INT, KEY C1(C1), KEY C2(C2)) ENGINE=MYISAM;
CREATE TABLE t2(C1 INT, C2 INT, KEY C1(C1), KEY C2(C2)) ENGINE=MYISAM;