summaryrefslogtreecommitdiff
path: root/mysql-test/r/ndb_autodiscover.result
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-10-24 11:36:29 +0500
committerunknown <ramil@mysql.com>2005-10-24 11:36:29 +0500
commit39af58dbd46636bf4d5bcdda56a090905f740ad7 (patch)
tree619517758503f7aaf39c2b8b7a147627ef05ce4a /mysql-test/r/ndb_autodiscover.result
parent811c6d216ec224a019dad5a99e356720677b6d22 (diff)
parentd29ecd5e91adf6eaeb4f2afef0db30648fe08065 (diff)
downloadmariadb-git-39af58dbd46636bf4d5bcdda56a090905f740ad7.tar.gz
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10303 mysql-test/r/query_cache.result: Auto merged mysql-test/t/query_cache.test: Auto merged sql/sql_cache.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'mysql-test/r/ndb_autodiscover.result')
-rw-r--r--mysql-test/r/ndb_autodiscover.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/ndb_autodiscover.result b/mysql-test/r/ndb_autodiscover.result
index 0f17160ea99..6d1b7eb152d 100644
--- a/mysql-test/r/ndb_autodiscover.result
+++ b/mysql-test/r/ndb_autodiscover.result
@@ -99,6 +99,8 @@ id int not null primary key,
id2 int not null,
name char(20)
) engine=ndb;
+Warnings:
+Note 1050 Table 't3' already exists
show status like 'handler_discover%';
Variable_name Value
Handler_discover 0