diff options
| author | unknown <msvensson@neptunus.homeip.net> | 2005-02-03 09:33:48 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.homeip.net> | 2005-02-03 09:33:48 +0100 |
| commit | 2b0a3dbe9e935762db81f9d08721417584197ff4 (patch) | |
| tree | 124933fc3f5e4d884003ee7d669c299d2fef2fb1 /mysql-test/include | |
| parent | f32743b7046eb04849aa6ca1cda6d40eef54ddd1 (diff) | |
| parent | 38e395aa325eb418cf92a6ce62646959ee2ed477 (diff) | |
| download | mariadb-git-2b0a3dbe9e935762db81f9d08721417584197ff4.tar.gz | |
Merged "query cache for ndb" to 5.0
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/ha_innodb.h:
Hand merged
sql/ha_ndbcluster.cc:
Merge with gathering of stats
sql/sql_cache.cc:
Use new table def cache
sql/table.h:
table.h had been cleaned up
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_multi_ndb.inc | 28 | ||||
| -rw-r--r-- | mysql-test/include/have_ndb.inc | 4 |
2 files changed, 29 insertions, 3 deletions
diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc new file mode 100644 index 00000000000..d0c083cab86 --- /dev/null +++ b/mysql-test/include/have_multi_ndb.inc @@ -0,0 +1,28 @@ +# Setup connections to both MySQL Servers connected to the cluster +connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,); +connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,); + +# Check that server1 has NDB support +connection server1; +disable_query_log; +--disable_warnings +drop table if exists t1, t2; +--enable_warnings +flush tables; +@r/have_ndb.require show variables like "have_ndbcluster"; +@r/server_id.require show variables like "server_id"; +enable_query_log; + +# Check that server2 has NDB support +connection server2; +disable_query_log; +--disable_warnings +drop table if exists t1, t2; +--enable_warnings +flush tables; +@r/have_ndb.require show variables like "have_ndbcluster"; +@r/server_id1.require show variables like "server_id"; +enable_query_log; + +# Set the default connection to 'server1' +connection server1; diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc index 84e60657876..d000a954733 100644 --- a/mysql-test/include/have_ndb.inc +++ b/mysql-test/include/have_ndb.inc @@ -2,6 +2,4 @@ disable_query_log; show variables like "have_ndbcluster"; enable_query_log; -#connect (server1,127.0.0.1,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); -#connect (server2,127.0.0.1,root,,test,$MASTER_MYPORT1,$MASTER_MYSOCK1); -#connection server1; + |