diff options
| author | unknown <skozlov/ksm@mysql.com/virtop.localdomain> | 2007-12-31 17:30:17 +0300 |
|---|---|---|
| committer | unknown <skozlov/ksm@mysql.com/virtop.localdomain> | 2007-12-31 17:30:17 +0300 |
| commit | f1e1a498a7a0a37b29e855ecc2afac496752f298 (patch) | |
| tree | d13e49a8364bc28056b944e7dbd4c57a96225249 | |
| parent | d658b408af7a208f747cae9818bc3ab626ac37c3 (diff) | |
| download | mariadb-git-f1e1a498a7a0a37b29e855ecc2afac496752f298.tar.gz | |
WL#4077 added support old versions of mysqld binaries
mysql-test/include/have_multi_ndb.inc:
check that information_schema.engines table exists
| -rw-r--r-- | mysql-test/include/have_multi_ndb.inc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc index 3a2100c1d25..fa201793eaf 100644 --- a/mysql-test/include/have_multi_ndb.inc +++ b/mysql-test/include/have_multi_ndb.inc @@ -4,26 +4,34 @@ connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,); # Check that server1 has NDB support connection server1; +let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1); disable_query_log; --disable_warnings drop table if exists t1, t2; --enable_warnings flush tables; +if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`) +{ --require r/true.require -select (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` from information_schema.engines where engine = 'ndbcluster'; +SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; --source include/ndb_not_readonly.inc +} enable_query_log; # Check that server2 has NDB support connection server2; +let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'engines', Tables_in_information_schema (engines), 1); disable_query_log; --disable_warnings drop table if exists t1, t2; --enable_warnings flush tables; +if (`SELECT 1 FROM dual WHERE '$engines_table' = 'engines'`) +{ --require r/true.require -select (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` from information_schema.engines where engine = 'ndbcluster'; +SELECT (support = 'YES' or support = 'DEFAULT' or support = 'ENABLED') as `TRUE` FROM information_schema.engines WHERE engine = 'ndbcluster'; --source include/ndb_not_readonly.inc +} enable_query_log; # Set the default connection to 'server1' |