database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/51
This commit is contained in:
tsmith/tim@siva.hindu.god
2006-12-22 13:43:48 -07:00
parent 8075fc447e 7245cb3d92
commit c5aa8fea82
11 changed files with 104 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/have_multi_ndb.inc
View File

@@ -24,5 +24,9 @@ flush tables;
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
# Check should be here as well...
# # Check that second master mysqld has come out of redonly mode
# --source include/ndb_not_readonly.inc
# Set the default connection to 'server1'
connection server1;

4
mysql-test/include/have_ndb.inc
View File

@@ -4,4 +4,8 @@ disable_query_log;
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
# Check that master mysqld has come out of redonly mode
--source include/ndb_not_readonly.inc

31
mysql-test/include/ndb_not_readonly.inc Normal file
View File

@@ -0,0 +1,31 @@
# Check that server has come out ot readonly mode
--disable_query_log
let $counter= 100;
let $mysql_errno= 1;
while ($mysql_errno)
{
--error 0, 1005
create table check_read_only(a int) engine=NDB;
sleep 0.1;
if (!$counter)
{
die("Failed while waiting for mysqld to come out of readonly mode");
}
dec $counter;
}
let $counter= 100;
let $mysql_errno= 1;
while ($mysql_errno)
{
--error 0, 1036
insert into check_read_only values(1);
sleep 0.1;
if (!$counter)
{
die("Failed while waiting for mysqld to come out of readonly mode");
}
dec $counter;
}
drop table check_read_only;
--enable_query_log