Commit bf532e26 authored by unknown's avatar unknown
Browse files

Moved test for multi ndb to have_ndb_multi

parent 5ffe6a7b

mysql-test/include/have_multi_ndb.inc

0 → 100644
+28 −0
Original line number Diff line number Diff line 
# 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;

mysql-test/include/have_ndb.inc

+0 −29
Original line number Diff line number Diff line
@@ -3,32 +3,3 @@ disable_query_log; 
show variables like "have_ndbcluster";

enable_query_log;

# 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;

mysql-test/t/ndb_cache_multi.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_query_cache.inc

-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc



--disable_warnings

drop table if exists t1, t2;

mysql-test/t/ndb_multi.test

+2 −0
Original line number Diff line number Diff line 
-- source include/have_ndb.inc

-- source include/have_multi_ndb.inc





--disable_warnings

drop table if exists t1, t2, t3, t4;