summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-03-02 15:36:18 +0100
committerSergei Golubchik <serg@mariadb.org>2017-03-10 18:21:24 +0100
commit48b1d175345caa3c644597044751906a04106b91 (patch)
tree3dca0a0fda49aed13c12899a0bd5d5993d6f4607 /mysql-test/r/ps.result
parent25c32c89f14cba402a42a61a8a371ce515610899 (diff)
downloadmariadb-git-48b1d175345caa3c644597044751906a04106b91.tar.gz
MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engine
Make SELECT <columns> FROM I_S.TABLES behave identically independently from whether <columns> require opening the table in engine or <columns> can be filled with only opening the frm. In particular, fill_schema_table_from_frm() should not silently skip frms with unknown engine, but should fill the I_S.TABLES row with NULLs just like fill_schema_table_by_open() does.
Diffstat (limited to 'mysql-test/r/ps.result')
-rw-r--r--mysql-test/r/ps.result9
1 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 1e63ac57768..b24fe55e1b2 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1203,12 +1203,21 @@ prepare my_stmt from @aux;
execute my_stmt;
COUNT(*)
46
+Warnings:
+Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
execute my_stmt;
COUNT(*)
46
+Warnings:
+Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
execute my_stmt;
COUNT(*)
46
+Warnings:
+Warning 1286 Unknown storage engine 'InnoDB'
+Warning 1286 Unknown storage engine 'InnoDB'
deallocate prepare my_stmt;
drop procedure if exists p1|
drop table if exists t1|