summaryrefslogtreecommitdiff
path: root/mysql-test/r/information_schema_all_engines.result
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-11-02 20:38:05 -0700
committerIgor Babaev <igor@askmonty.org>2012-11-02 20:38:05 -0700
commit8d612adf70c53dcb741b097133e09d176d0780e1 (patch)
tree278a83cc5caaccbfb408471cef6bde5e5171d802 /mysql-test/r/information_schema_all_engines.result
parent4ffc9c3b01459a2904a7154a6c750d128864fc7b (diff)
parent32443e744d354fbba93c8761486462b5820b74bb (diff)
downloadmariadb-git-8d612adf70c53dcb741b097133e09d176d0780e1.tar.gz
Merge 5.5 -> 5.5-mwl248.
Diffstat (limited to 'mysql-test/r/information_schema_all_engines.result')
-rw-r--r--mysql-test/r/information_schema_all_engines.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/information_schema_all_engines.result b/mysql-test/r/information_schema_all_engines.result
index 4dac9a3e53c..455f2e36ffc 100644
--- a/mysql-test/r/information_schema_all_engines.result
+++ b/mysql-test/r/information_schema_all_engines.result
@@ -418,4 +418,4 @@ Wildcard: inf_rmation_schema
SELECT table_schema, count(*) FROM information_schema.TABLES WHERE table_schema IN ('mysql', 'INFORMATION_SCHEMA', 'test', 'mysqltest') AND table_name<>'ndb_binlog_index' AND table_name<>'ndb_apply_status' GROUP BY TABLE_SCHEMA;
table_schema count(*)
information_schema 58
-mysql 23
+mysql 26