diff options
Diffstat (limited to 'mysql-test/include')
34 files changed, 38 insertions, 479 deletions
diff --git a/mysql-test/include/ctype_utf8mb4.inc b/mysql-test/include/ctype_utf8mb4.inc index 9ee2414e142..1971cc0c9a1 100644 --- a/mysql-test/include/ctype_utf8mb4.inc +++ b/mysql-test/include/ctype_utf8mb4.inc @@ -191,17 +191,9 @@ drop table t1; # if(!$is_heap) { -if(!$is_ndb) -{ --error ER_TOO_LONG_KEY eval create table t1 (a text character set utf8mb4, primary key(a(371))) engine $engine; } -if($is_ndb) -{ ---error ER_BLOB_USED_AS_KEY -eval create table t1 (a text character set utf8mb4, primary key(a(371))) engine $engine; -} -} # # Bug 2959 @@ -254,8 +246,6 @@ drop table t2; # Bug 4521: unique key prefix interacts poorly with utf8mb4 # MYISAM: keys with prefix compression, case insensitive collation. # -if (!$is_ndb) -{ eval create table t1 (c varchar(30) character set utf8mb4, unique(c(10))) engine $engine; insert into t1 values ('1'),('2'),('3'),('x'),('y'),('z'); insert into t1 values ('aaaaaaaaaa'); @@ -549,7 +539,6 @@ select c as c_all from t1 order by c; select c as c_a from t1 where c='a'; select c as c_a from t1 where c='б'; drop table t1; -} # Bug#4594: column index make = failed for gbk, but like works @@ -593,8 +582,6 @@ drop table t1; # the same for HEAP+HASH # -if (!$is_ndb) -{ eval create table t1 ( str varchar(255) character set utf8mb4 not null, key str using hash (str(2)) @@ -618,7 +605,6 @@ INSERT INTO t1 VALUES ('str'); INSERT INTO t1 VALUES ('str2'); select * from t1 where str='str'; drop table t1; -} # # Bug #5397: Crash with varchar binary and LIKE @@ -651,8 +637,6 @@ DROP TABLE t1; # if (!$is_heap) { -if (!$is_ndb) -{ eval CREATE TABLE t1 ( id int unsigned NOT NULL auto_increment, list_id smallint unsigned NOT NULL, @@ -689,7 +673,6 @@ SELECT id, term FROM t1 where (list_id = 1) AND (term = "testetest"); SELECT id, term FROM t1 where (list_id = 1) AND (term = "testčtest"); DROP TABLE t1; } -} # # Bug #6019 SELECT tries to use too short prefix index on utf8mb4 data @@ -979,14 +962,7 @@ if (!$is_heap) # eval CREATE TABLE t1 (t TINYTEXT CHARACTER SET utf8mb4) ENGINE $engine; INSERT INTO t1 VALUES(REPEAT('a', 100)); -if (!$is_ndb) -{ eval CREATE TEMPORARY TABLE t2 ENGINE $engine SELECT COALESCE(t) AS bug FROM t1; -} -if ($is_ndb) -{ -eval CREATE TABLE t2 ENGINE $engine SELECT COALESCE(t) AS bug FROM t1; -} SELECT LENGTH(bug) FROM t2; DROP TABLE t2; DROP TABLE t1; @@ -1202,8 +1178,6 @@ SET NAMES latin2; if (!$is_heap) { -if (!$is_ndb) -{ eval CREATE TABLE t1 ( id int(11) NOT NULL default '0', tid int(11) NOT NULL default '0', @@ -1229,7 +1203,6 @@ SELECT * FROM t1 WHERE tid=72 and val LIKE 'VOLNÝ ADSL'; DROP TABLE t1; } -} # # Bug 20709: problem with utf8mb4 fields in temporary tables @@ -1318,8 +1291,6 @@ drop table t1; # # Check that do_varstring2_mb produces a warning # -if (!$is_ndb) -{ eval create table t1 ( a varchar(4000) not null ) default character set utf8mb4 engine $engine; @@ -1327,7 +1298,6 @@ insert into t1 values (repeat('a',4000)); alter table t1 change a a varchar(3000) character set utf8mb4 not null; select length(a) from t1; drop table t1; -} # # Bug#10504: Character set does not support traditional mode @@ -1614,8 +1584,6 @@ set max_sort_length=default; --echo # if (!$is_heap) { -if (!$is_ndb) -{ eval CREATE TABLE t1 ( clipid INT NOT NULL, Tape TINYTEXT, @@ -1626,7 +1594,6 @@ ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid; SHOW CREATE TABLE t1; DROP TABLE t1; } -} #--echo # #--echo # Check that supplementary characters are not allowed in identifiers @@ -1807,12 +1774,9 @@ INSERT INTO t2 VALUES (x'ea9da8'); SELECT HEX(CONCAT(utf8mb4, utf8mb3)) FROM t1,t2 ORDER BY 1; SELECT CHARSET(CONCAT(utf8mb4, utf8mb3)) FROM t1, t2 LIMIT 1; -if (!$is_ndb) -{ eval CREATE TEMPORARY TABLE t3 ENGINE $engine AS SELECT *, concat(utf8mb4,utf8mb3) FROM t1, t2; SHOW CREATE TABLE t3; DROP TEMPORARY TABLE t3; -} SELECT * FROM t1, t2 WHERE t1.utf8mb4 > t2.utf8mb3; SELECT * FROM t1, t2 WHERE t1.utf8mb4 = t2.utf8mb3; diff --git a/mysql-test/include/default_ndbd.cnf b/mysql-test/include/default_ndbd.cnf deleted file mode 100644 index 9a88a5936aa..00000000000 --- a/mysql-test/include/default_ndbd.cnf +++ /dev/null @@ -1,27 +0,0 @@ - -[cluster_config] -MaxNoOfSavedMessages= 1000 -MaxNoOfConcurrentTransactions= 128 -MaxNoOfConcurrentOperations= 10000 -DataMemory= 20M -IndexMemory= 1M -Diskless= 0 -TimeBetweenWatchDogCheck= 30000 -MaxNoOfOrderedIndexes= 32 -MaxNoOfAttributes= 2048 -TimeBetweenGlobalCheckpoints= 500 -NoOfFragmentLogFiles= 4 -FragmentLogFileSize= 12M -DiskPageBufferMemory= 4M - -# O_DIRECT has issues on 2.4 whach have not been handled, Bug #29612 -#ODirect= 1 -# the following parametes just function as a small regression -# test that the parameter exists -InitialNoOfOpenFiles= 27 - -# Increase timeouts for slow test-machines -HeartbeatIntervalDbDb= 30000 -HeartbeatIntervalDbApi= 30000 - -#TransactionDeadlockDetectionTimeout= 7500 diff --git a/mysql-test/include/have_aria.inc b/mysql-test/include/have_aria.inc new file mode 100644 index 00000000000..18f2b4b0063 --- /dev/null +++ b/mysql-test/include/have_aria.inc @@ -0,0 +1,4 @@ +if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'aria' AND support IN ('YES', 'DEFAULT', 'ENABLED')`) +{ + --skip Test requires Aria +} diff --git a/mysql-test/include/have_innodb_disallow_writes.inc b/mysql-test/include/have_innodb_disallow_writes.inc new file mode 100644 index 00000000000..83b516b7a34 --- /dev/null +++ b/mysql-test/include/have_innodb_disallow_writes.inc @@ -0,0 +1,6 @@ +--source include/have_innodb.inc + +if (`SELECT COUNT(*) = 0 from INFORMATION_SCHEMA.GLOBAL_VARIABLES + WHERE VARIABLE_NAME = 'INNODB_DISALLOW_WRITES'`) { + --skip Test requires 'innodb_disallow_writes' +} diff --git a/mysql-test/include/have_multi_ndb.inc b/mysql-test/include/have_multi_ndb.inc deleted file mode 100644 index 8dbfa2aa034..00000000000 --- a/mysql-test/include/have_multi_ndb.inc +++ /dev/null @@ -1,52 +0,0 @@ -# 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; -let $engines_table= query_get_value(SHOW TABLES FROM information_schema LIKE 'ENGINES', Tables_in_information_schema (ENGINES), 1); -disable_query_log; -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'; ---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; -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'; ---source include/ndb_not_readonly.inc -} -enable_query_log; - -# cleanup - -connection server1; -disable_query_log; -disable_warnings; ---error 0,1051 -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; -flush tables; -flush status; -enable_warnings; -enable_query_log; - -connection server2; -disable_query_log; -disable_warnings; ---error 0,1051 -drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10; -flush tables; -flush status; -enable_warnings; -enable_query_log; - -# Set the default connection -connection server1; diff --git a/mysql-test/include/have_mutex_deadlock_detector.inc b/mysql-test/include/have_mutex_deadlock_detector.inc index 3672f3eccef..88a7484a3e8 100644 --- a/mysql-test/include/have_mutex_deadlock_detector.inc +++ b/mysql-test/include/have_mutex_deadlock_detector.inc @@ -1,4 +1,3 @@ ---require r/have_mutex_deadlock_detector.require -disable_query_log; -select 1 from information_schema.global_variables where variable_name = "mutex_deadlock_detector"; -enable_query_log; +if (`select count(*)=0 from information_schema.global_variables where variable_name = "debug_mutex_deadlock_detector"`) { + skip needs safemutex deadlock detector; +} diff --git a/mysql-test/include/have_ndb.inc b/mysql-test/include/have_ndb.inc deleted file mode 100644 index 1266f80c8cd..00000000000 --- a/mysql-test/include/have_ndb.inc +++ /dev/null @@ -1,2 +0,0 @@ -# Check that server is compiled and started with support for NDB ---source include/have_multi_ndb.inc diff --git a/mysql-test/include/have_ndb_extra.inc b/mysql-test/include/have_ndb_extra.inc deleted file mode 100644 index 4837a7ad4ea..00000000000 --- a/mysql-test/include/have_ndb_extra.inc +++ /dev/null @@ -1,2 +0,0 @@ --- require r/have_ndb_extra.require -eval select $NDB_EXTRA_TEST; diff --git a/mysql-test/include/have_ndbapi_examples.inc b/mysql-test/include/have_ndbapi_examples.inc deleted file mode 100644 index 88499d555c0..00000000000 --- a/mysql-test/include/have_ndbapi_examples.inc +++ /dev/null @@ -1,4 +0,0 @@ ---require r/have_ndbapi_examples.require -disable_query_log; -eval select LENGTH('$NDB_EXAMPLES_BINARY') > 0 as 'have_ndb_example'; -enable_query_log; diff --git a/mysql-test/include/have_wsrep.inc b/mysql-test/include/have_wsrep.inc new file mode 100644 index 00000000000..52220edf481 --- /dev/null +++ b/mysql-test/include/have_wsrep.inc @@ -0,0 +1,8 @@ +# To be used in a test which requires server to be compiled with wsrep support +# (-DWITH_WSREP=ON) and wsrep plugin is ACTIVE. + +if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsrep' AND PLUGIN_STATUS='ACTIVE'`) +{ + --skip Test requires wsrep plugin. +} + diff --git a/mysql-test/include/loaddata_autocom.inc b/mysql-test/include/loaddata_autocom.inc index bb286fb4169..3bf88fefa6d 100644 --- a/mysql-test/include/loaddata_autocom.inc +++ b/mysql-test/include/loaddata_autocom.inc @@ -1,5 +1,4 @@ # Test if the engine does autocommit in LOAD DATA INFILE, or not -# (NDB wants to do, others don't). eval SET SESSION STORAGE_ENGINE = $engine_type; @@ -9,8 +8,6 @@ drop table if exists t1; let $load_file= $MYSQLTEST_VARDIR/std_data/loaddata2.dat; -# NDB does not support the create option 'Binlog of table with BLOB attribute and no PK' -# So use a dummy PK here. create table t1 (id int unsigned not null auto_increment primary key, a text, b text); start transaction; --replace_result $load_file LOAD_FILE diff --git a/mysql-test/include/mtr_check.sql b/mysql-test/include/mtr_check.sql index e34e32ad1a6..e54041da1bc 100644 --- a/mysql-test/include/mtr_check.sql +++ b/mysql-test/include/mtr_check.sql @@ -47,7 +47,7 @@ BEGIN -- Show "mysql" database, tables and columns SELECT CONCAT(table_schema, '.', table_name) AS tables_in_mysql FROM INFORMATION_SCHEMA.TABLES - WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' + WHERE table_schema='mysql' ORDER BY tables_in_mysql; SELECT CONCAT(table_schema, '.', table_name) AS columns_in_mysql, column_name, ordinal_position, column_default, is_nullable, @@ -55,7 +55,7 @@ BEGIN numeric_precision, numeric_scale, character_set_name, collation_name, column_type, column_key, extra, column_comment FROM INFORMATION_SCHEMA.COLUMNS - WHERE table_schema='mysql' AND table_name != 'ndb_apply_status' + WHERE table_schema='mysql' ORDER BY columns_in_mysql; -- Dump all events, there should be none diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 0ad1079cd92..bc8d8044afb 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -115,9 +115,6 @@ INSERT INTO global_suppressions VALUES ("unknown variable 'loose-"), ("You have forced lower_case_table_names to 0 through a command-line option"), ("Setting lower_case_table_names=2"), - ("NDB Binlog:"), - ("NDB: failed to setup table"), - ("NDB: only row based binary logging"), ("Neither --relay-log nor --relay-log-index were used"), ("Query partially completed"), ("Slave I.O thread aborted while waiting for relay log"), @@ -139,7 +136,6 @@ INSERT INTO global_suppressions VALUES ("Slave: The incident LOST_EVENTS occured on the master"), ("Slave: Unknown error.* 1105"), ("Slave: Can't drop database.* database doesn't exist"), - ("Time-out in NDB"), ("Warning:\s+One can only use the --user.*root"), ("Warning:\s+Table:.* on (delete|rename)"), ("You have an error in your SQL syntax"), diff --git a/mysql-test/include/ndb_backup.inc b/mysql-test/include/ndb_backup.inc deleted file mode 100644 index eef3bf2bd1e..00000000000 --- a/mysql-test/include/ndb_backup.inc +++ /dev/null @@ -1,48 +0,0 @@ -###################################################### -# By JBM 2006-02-16 So that the code is not repeated # -# in test cases and can be reused. # -###################################################### - ---exec $NDB_MGM --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -e "start backup" >> $NDB_TOOLS_OUTPUT - -# To find the backupid, we must dump this data to a table, and SELECT -# what we want into an outfile. This could be accomplished with grep, but -# grep isn't Windows-portable - ---disable_query_log -# create a table to help us out ---disable_warnings # leave this on until done with the entire process -# cleanup -DROP TABLE IF EXISTS helper1; -CREATE TABLE helper1(c1 VARCHAR(20)); -# dump raw data to file -let $ndb_backup_file1= $MYSQLTEST_VARDIR/ndb_backup_tmp.dat; -let $ndb_backup_file2= $MYSQLTEST_VARDIR/tmp.dat; ---disable_warnings ---error 0,1 ---remove_file $ndb_backup_file1 ---enable_warnings ---exec $NDB_TOOLS_DIR/ndb_select_all --ndb-connectstring="$NDB_CONNECTSTRING" -d sys --delimiter=',' SYSTAB_0 > $ndb_backup_file1 -# load the table from the raw data file -eval LOAD DATA INFILE '$ndb_backup_file1' INTO TABLE helper1; ---remove_file $ndb_backup_file1 -# output what we need -eval SELECT * FROM helper1 WHERE c1 LIKE '%520093696%' -INTO OUTFILE '$ndb_backup_file2'; -# cleanup -DROP TABLE helper1; ---enable_warnings ---enable_query_log - -CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info -(id INT, backup_id INT) ENGINE = MEMORY; - ---replace_result $MYSQLTEST_VARDIR <MYSQLTEST_VARDIR> -eval LOAD DATA INFILE '$ndb_backup_file2' INTO TABLE test.backup_info FIELDS TERMINATED BY ','; ---remove_file $ndb_backup_file2 - -# Load backup id into environment variable -let the_backup_id=`SELECT backup_id from test.backup_info`; - -DROP TABLE test.backup_info; - diff --git a/mysql-test/include/ndb_backup_print.inc b/mysql-test/include/ndb_backup_print.inc deleted file mode 100644 index 69faa8f421b..00000000000 --- a/mysql-test/include/ndb_backup_print.inc +++ /dev/null @@ -1,9 +0,0 @@ ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat ---exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat ---disable_warnings ---error 0,1 ---remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat ---enable_warnings ---let ndb_restore_opts= ---let ndb_restore_filter= diff --git a/mysql-test/include/ndb_default_cluster.inc b/mysql-test/include/ndb_default_cluster.inc deleted file mode 100644 index de7eda3c596..00000000000 --- a/mysql-test/include/ndb_default_cluster.inc +++ /dev/null @@ -1,4 +0,0 @@ --- require r/ndb_default_cluster.require -disable_query_log; -show status like "Ndb_config_from_host"; -enable_query_log; diff --git a/mysql-test/include/ndb_master-slave.inc b/mysql-test/include/ndb_master-slave.inc deleted file mode 100644 index 8305a310953..00000000000 --- a/mysql-test/include/ndb_master-slave.inc +++ /dev/null @@ -1,12 +0,0 @@ ---source include/master-slave.inc - -connection slave; -# Check that server is compiled and started with support for NDB -disable_query_log; ---require r/true.require -select (support = 'YES' or support = 'DEFAULT') as `TRUE` from information_schema.engines where engine = 'ndbcluster'; ---source include/ndb_not_readonly.inc -enable_query_log; - -# Set the default connection to 'master' -connection master; diff --git a/mysql-test/include/ndb_master-slave_2ch.inc b/mysql-test/include/ndb_master-slave_2ch.inc deleted file mode 100644 index 17017d2b801..00000000000 --- a/mysql-test/include/ndb_master-slave_2ch.inc +++ /dev/null @@ -1,67 +0,0 @@ -# ==== Purpose ==== -# -# Set up circular cluster replication where each -# cluster has two mysqlds and replication directions are -# following: -# master ---> slave -# / \ -# cluster A cluster B -# \ / -# master1 <--- slave1 -# -# ==== Usage ==== -# -# [--let $rpl_server_count= N] -# [--let $rpl_skip_check_server_ids= 1] -# [--let $rpl_skip_reset_master_and_slave= 1] -# [--let $rpl_skip_change_master= 1] -# [--let $rpl_skip_start_slave= 1] -# [--let $rpl_debug= 1] -# [--let $slave_timeout= NUMBER] -# --source include/ndb_master-slave_2ch.inc -# -# Parameters: -# $rpl_server_count, $rpl_skip_check_server_ids, -# $rpl_skip_reset_master_and_slave, $rpl_skip_change_master, -# $rpl_skip_start_slave, $rpl_debug, $slave_timeout -# See include/master-slave.inc - ---let $rpl_topology= 1->2,4->3 ---let $rpl_skip_check_server_ids= 1 ---source include/rpl_init.inc - -# Make connections to mysqlds - ---let $rpl_connection_name= master ---let $rpl_server_number= 1 ---source include/rpl_connect.inc - ---let $rpl_connection_name= master1 ---let $rpl_server_number= 1 ---source include/rpl_connect.inc - ---let $rpl_connection_name= slave ---let $rpl_server_number= 2 ---source include/rpl_connect.inc - ---let $rpl_connection_name= slave1 ---let $rpl_server_number= 2 ---source include/rpl_connect.inc - - -# Check that all mysqld are compiled with ndb support ---let $_rpl_server= 4 -while ($_rpl_server) -{ - --connection server_$_rpl_server - if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'ndbcluster' AND (support = 'YES' OR support = 'DEFAULT')`) - { - --skip Test requires NDB. - } - --source include/ndb_not_readonly.inc - --dec $_rpl_server -} - - -# Set the default connection to 'master' (cluster A) -connection master; diff --git a/mysql-test/include/ndb_not_readonly.inc b/mysql-test/include/ndb_not_readonly.inc deleted file mode 100644 index ebb343bb18d..00000000000 --- a/mysql-test/include/ndb_not_readonly.inc +++ /dev/null @@ -1,36 +0,0 @@ -# Check that server has come out ot readonly mode -# -# wait for server to connect properly to cluster -# - ---disable_query_log - -set @saved_log = @@sql_log_bin; -set sql_log_bin = 0; ---error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_KEY_NOT_FOUND -delete from mysql.ndb_apply_status where server_id=0; -let $mysql_errno= 1; -let $counter= 600; -while ($mysql_errno) -{ - # Table is readonly until the mysqld has connected properly - --error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG - replace into mysql.ndb_apply_status values(0,0,"",0,0); - if ($mysql_errno) - { - if (!$counter) - { - die Failed while waiting for mysqld to come out of readonly mode; - } - dec $counter; - --sleep 0.1 - } -} -delete from mysql.ndb_apply_status where server_id=0; -set sql_log_bin = @saved_log; - ---enable_query_log - -# -# connected -# diff --git a/mysql-test/include/ndb_restore_master.inc b/mysql-test/include/ndb_restore_master.inc deleted file mode 100644 index ae5f055b442..00000000000 --- a/mysql-test/include/ndb_restore_master.inc +++ /dev/null @@ -1,8 +0,0 @@ -###################################################### -# By JBM 2006-02-16 So that the code is not repeated # -# in test cases and can be reused. # -###################################################### - ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING" -p 8 -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT diff --git a/mysql-test/include/ndb_restore_slave_eoption.inc b/mysql-test/include/ndb_restore_slave_eoption.inc deleted file mode 100644 index a8657f68c8d..00000000000 --- a/mysql-test/include/ndb_restore_slave_eoption.inc +++ /dev/null @@ -1,11 +0,0 @@ -###################################################### -# By JBM 2006-03-08 So that the code is not repeated # -# in test cases and can be reused. # -###################################################### - ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - ---exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --ndb-connectstring="$NDB_CONNECTSTRING_SLAVE" -p 8 -b $the_backup_id -n 2 -r -e --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT - - - diff --git a/mysql-test/include/ndb_setup_slave.inc b/mysql-test/include/ndb_setup_slave.inc deleted file mode 100644 index 5ee55150550..00000000000 --- a/mysql-test/include/ndb_setup_slave.inc +++ /dev/null @@ -1,27 +0,0 @@ -# -# now setup replication to continue from last epoch -# 1. get ndb_apply_status epoch from slave -# 2. get corresponding _next_ binlog postition from master -# 3. change master on slave - -# 1. ---connection slave ---replace_column 1 <the_epoch> -SELECT @the_epoch:=MAX(epoch) FROM mysql.ndb_apply_status; ---let $the_epoch= `select @the_epoch` - -# 2. ---connection master ---replace_result $the_epoch <the_epoch> ---replace_column 1 <the_pos> -eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1) - FROM mysql.ndb_binlog_index WHERE epoch > $the_epoch ORDER BY epoch ASC LIMIT 1; ---let $the_pos= `SELECT @the_pos` ---let $the_file= `SELECT @the_file` - -# 3. ---connection slave ---replace_result $the_pos <the_pos> -eval CHANGE MASTER TO - master_log_file = '$the_file', - master_log_pos = $the_pos ; diff --git a/mysql-test/include/ndb_wait_connected.inc b/mysql-test/include/ndb_wait_connected.inc deleted file mode 100644 index cfea94db1f1..00000000000 --- a/mysql-test/include/ndb_wait_connected.inc +++ /dev/null @@ -1,26 +0,0 @@ -# Check that mysqld has reconnected to ndbd after -# restart of ndbd -# ---disable_query_log ---disable_result_log -let $mysql_errno= 1; -let $counter= 600; -while ($mysql_errno) -{ - --error 0,157 - CREATE TABLE ndb_wait_connected (a int primary key); - if ($mysql_errno) - { - if (!$counter) - { - die Failed waiting for mysqld to reconnect to ndbd; - } - dec $counter; - --sleep 0.1 - } -} -DROP TABLE ndb_wait_connected; ---enable_query_log ---enable_result_log - - diff --git a/mysql-test/include/not_ndb.inc b/mysql-test/include/not_ndb.inc deleted file mode 100644 index 965538c20a7..00000000000 --- a/mysql-test/include/not_ndb.inc +++ /dev/null @@ -1,7 +0,0 @@ --- require r/not_ndb.require -disable_query_log; -# so that both DISABLED and NO is output as NO --- replace_result DISABLED NO -show variables like "have_ndbcluster"; -enable_query_log; - diff --git a/mysql-test/include/not_ndb_default.inc b/mysql-test/include/not_ndb_default.inc deleted file mode 100644 index 682a2944171..00000000000 --- a/mysql-test/include/not_ndb_default.inc +++ /dev/null @@ -1,4 +0,0 @@ ---require r/not_ndb_default.require -disable_query_log; -select convert(@@storage_engine using latin1) NOT IN ("ndbcluster","NDBCLUSTER") as "TRUE"; -enable_query_log; diff --git a/mysql-test/include/ps_conv.inc b/mysql-test/include/ps_conv.inc index 2e42542d19a..dba182e0b3e 100644 --- a/mysql-test/include/ps_conv.inc +++ b/mysql-test/include/ps_conv.inc @@ -256,9 +256,14 @@ execute stmt1 using @my_key ; execute full_info ; --disable_metadata -# the next statement must fail ---error 1064 +# the next statement does not fail anymore prepare stmt1 from "select c1 into ? from t9 where c1= 1" ; +execute stmt1 using @result; +--enable_metadata +execute full_info ; +--disable_metadata +select @result; + diff --git a/mysql-test/include/ps_query.inc b/mysql-test/include/ps_query.inc index 8148935cbe1..932e80f8b81 100644 --- a/mysql-test/include/ps_query.inc +++ b/mysql-test/include/ps_query.inc @@ -428,7 +428,6 @@ execute stmt1 using @arg01, @arg02; prepare stmt1 from ' select a, b FROM t1 outer_table where a = (select a from t1 where b = outer_table.b ) order by a '; # also Bug#4000 (only BDB tables) -# Bug#4106 : ndb table, query with correlated subquery, wrong result execute stmt1 ; # test case derived from client_test.c: test_subqueries_ref let $1= 3 ; diff --git a/mysql-test/include/rpl_init.inc b/mysql-test/include/rpl_init.inc index 09569fc2b57..4ee4cccdc20 100644 --- a/mysql-test/include/rpl_init.inc +++ b/mysql-test/include/rpl_init.inc @@ -35,9 +35,7 @@ # (It is allowed, but not required, to configure SERVER_MYPORT_1 # and SERVER_MYPORT_2 too. If these variables are not set, the # variables MASTER_MYPORT and SLAVE_MYPORT, configured in the -# default my.cnf used by the rpl and rpl_ndb suites, are used -# instead. In addition, in the rpl_ndb suite, SERVER_MYPORT_3 is -# not needed since MASTER_MYPORT1 can be used instead.) +# default my.cnf used by the rpl suite, are used instead.) # # 2. Execute the following near the top of the test: # @@ -124,18 +122,6 @@ if (!$SERVER_MYPORT_2) { --let SERVER_MYPORT_2= $SLAVE_MYPORT } -# Allow $MASTER_MYPORT1 as alias for $SERVER_MYPORT_3 -# (this alias is used by rpl_ndb tests) -if (!$SERVER_MYPORT_3) -{ - --let SERVER_MYPORT_3= $MASTER_MYPORT1 -} -# Allow $SLAVE_MYPORT1 as alias for $SERVER_MYPORT_4 -# (this alias is used by rpl_ndb tests) -if (!$SERVER_MYPORT_4) -{ - --let SERVER_MYPORT_4= $SLAVE_MYPORT1 -} # Check that $rpl_server_count is set if (!$rpl_server_count) { diff --git a/mysql-test/include/rpl_multi_engine2.inc b/mysql-test/include/rpl_multi_engine2.inc index e683a1d5838..24154220cb0 100644 --- a/mysql-test/include/rpl_multi_engine2.inc +++ b/mysql-test/include/rpl_multi_engine2.inc @@ -72,10 +72,6 @@ ORDER BY id; connection master; --echo --- Remove a record from t1 on master --- -# Note: there is an error in replication of Delete_row -# from NDB to MyISAM (BUG#28538). However, if there is -# only one row in Delete_row event then it works fine, -# as this test demonstrates. DELETE FROM t1 WHERE id = 412; --echo --- Show current count on master for t1 --- diff --git a/mysql-test/include/safe_set_to_maybe_ro_var.inc b/mysql-test/include/safe_set_to_maybe_ro_var.inc deleted file mode 100644 index add7f2091b3..00000000000 --- a/mysql-test/include/safe_set_to_maybe_ro_var.inc +++ /dev/null @@ -1,23 +0,0 @@ -# to mask out the error - never abort neither log in result file - in setting -# to read-only variable. -# It is assumed that the new value is equal to one the var was set to. -# Such situation happens particularily with binlog_format that becomes read-only -# with ndb default storage. -# -# when generate results always watch the file to find what is expected, -# the SET query may fail - -# script accepts $maybe_ro_var the var name and $val4var the value - -### USAGE: -### let $maybe_ro_var= ... -### let $val4var= ... -### include/safe_set_to_maybe_ro_var.inc - ---disable_result_log ---disable_abort_on_error -eval SET $maybe_ro_var = $val4var; ---enable_abort_on_error ---enable_result_log - -eval SELECT $maybe_ro_var; diff --git a/mysql-test/include/select_ndb_apply_status.inc b/mysql-test/include/select_ndb_apply_status.inc deleted file mode 100644 index a676b7cfb06..00000000000 --- a/mysql-test/include/select_ndb_apply_status.inc +++ /dev/null @@ -1,13 +0,0 @@ -################################################## -# Author: Jeb -# Date: 2007/04 -# Purpose: To select out log name, start and end -# positions from ndb_apply_status table -################################################## ---replace_column 1 <log_name> 2 <start_pos> 3 <end_pos> -select @log_name:=log_name, @start_pos:=start_pos, @end_pos:=end_pos - from mysql.ndb_apply_status; ---let $start_pos = `select @start_pos` ---let $end_pos = `select @end_pos` ---let $log_name = `select @log_name` - diff --git a/mysql-test/include/wait_for_ndb_to_binlog.inc b/mysql-test/include/wait_for_ndb_to_binlog.inc deleted file mode 100644 index c1f94802724..00000000000 --- a/mysql-test/include/wait_for_ndb_to_binlog.inc +++ /dev/null @@ -1,26 +0,0 @@ -# ==== Purpose ==== -# -# Several test primitives from mysql-test/extra/rpl_tests -# are shared for test cases for MyISAM, InnoDB, NDB and -# other engines. -# For NDB engine all events will be added by NDB injector -# so tests only can continue after injector is ready, -# this test waits for proper injector thread state. -# -# ==== Usage ==== -# -# let $engine_type= NDB; -# --source include/wait_for_ndb_to_binlog.inc -# -# ==== Parameters ===== -# -# $engine_type -# Type of engine. If type is NDB then it waits for injector -# thread proper state. - -if (`SELECT UPPER(LEFT('$engine_type',3)) = 'NDB'`) { - let $show_statement= SHOW PROCESSLIST; - let $field= State; - let $condition= = 'Waiting for event from ndbcluster'; - source include/wait_show_condition.inc; -} diff --git a/mysql-test/include/word_size.combinations b/mysql-test/include/word_size.combinations new file mode 100644 index 00000000000..9b58a0c85c6 --- /dev/null +++ b/mysql-test/include/word_size.combinations @@ -0,0 +1,3 @@ +[32bit] + +[64bit] diff --git a/mysql-test/include/word_size.inc b/mysql-test/include/word_size.inc new file mode 100644 index 00000000000..fb796c251fc --- /dev/null +++ b/mysql-test/include/word_size.inc @@ -0,0 +1,4 @@ +# +# tests that include this file will be run for an appropriate combination. +# See word_size.combinations for the list of combinations. +# |