diff options
| author | Christopher Powers <chris.powers@oracle.com> | 2010-11-30 11:20:56 -0600 |
|---|---|---|
| committer | Christopher Powers <chris.powers@oracle.com> | 2010-11-30 11:20:56 -0600 |
| commit | 8f3d884dd2116fa37221bbbc9704ff27d07518e0 (patch) | |
| tree | 5d419d95f834e4929e57f238163508198163c262 /mysql-test/r/lock_multi.result | |
| parent | 7009fd0e7d72327d11c53b180f05e80d64eff522 (diff) | |
| download | mariadb-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/lock_multi.result')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 99e1f54e762..1a8ef2deefd 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -430,6 +430,8 @@ SELECT table_name, table_comment FROM information_schema.tables WHERE table_schema= 'test' AND table_name= 't1'; table_name table_comment t1 Lock wait timeout exceeded; try restarting transaction +Warnings: +Warning 1205 Lock wait timeout exceeded; try restarting transaction # Connection default UNLOCK TABLES; # Connection con3 |