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 bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
This commit is contained in:
cmiller@zippy.cornsilk.net
2007-01-07 09:31:49 -05:00
parent 05d05c776f 1942fd0a49
commit a16eaf3301
80 changed files with 1229 additions and 1734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mysql-test/include/have_example_plugin.inc Normal file
View File

@@ -0,0 +1,16 @@
#
# Check if server has support for loading udf's
# i.e it will support dlopen
#
--require r/have_dynamic_loading.require
disable_query_log;
show variables like "have_dynamic_loading";
enable_query_log;
#
# Check if the variable EXAMPLE_PLUGIN is set
#
--require r/have_example_plugin.require
disable_query_log;
eval select LENGTH("$EXAMPLE_PLUGIN") > 0 as "have_example_plugin";
enable_query_log;

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

2
mysql-test/include/have_udf.inc
View File

@@ -2,7 +2,7 @@
# Check if server has support for loading udf's
# i.e it will support dlopen
#
--require r/have_udf.require
--require r/have_dynamic_loading.require
disable_query_log;
show variables like "have_dynamic_loading";
enable_query_log;

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