WL#3303
- row based ndb logging also in mixed
This commit is contained in:
parent
6a2ef78c89
commit
e21310b1ef
@ -3,7 +3,7 @@
|
|||||||
-- source include/not_embedded.inc
|
-- source include/not_embedded.inc
|
||||||
|
|
||||||
# see bug#21563
|
# see bug#21563
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1, t2;
|
drop table if exists t1, t2;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1, t2;
|
drop table if exists t1, t2;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_multi_ndb.inc
|
-- source include/have_multi_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
connection server2;
|
connection server2;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
reset master;
|
reset master;
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_multi_ndb.inc
|
-- source include/have_multi_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
connection server2;
|
connection server2;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_multi_ndb.inc
|
-- source include/have_multi_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
connection server2;
|
connection server2;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_multi_ndb.inc
|
-- source include/have_multi_ndb.inc
|
||||||
-- source include/not_embedded.inc
|
-- source include/not_embedded.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
|
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
|
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
|
||||||
########################################################
|
########################################################
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
--source extra/rpl_tests/rpl_row_UUID.test
|
--source extra/rpl_tests/rpl_row_UUID.test
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_ndb_extra.inc
|
--source include/have_ndb_extra.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
# kill any trailing processes
|
# kill any trailing processes
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# code between engine tests #
|
# code between engine tests #
|
||||||
#################################
|
#################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDBCLUSTER;
|
let $engine_type=NDBCLUSTER;
|
||||||
-- source extra/rpl_tests/rpl_row_blob.test
|
-- source extra/rpl_tests/rpl_row_blob.test
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
# set up circular replication
|
# set up circular replication
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
connection master;
|
connection master;
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
#### Include Section ####
|
#### Include Section ####
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_default_cluster.inc
|
--source include/ndb_default_cluster.inc
|
||||||
--source include/not_embedded.inc
|
--source include/not_embedded.inc
|
||||||
#--source include/big_test.inc
|
#--source include/big_test.inc
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
--echo --- Doing pre test cleanup ---
|
--echo --- Doing pre test cleanup ---
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
let $engine_type= NDB;
|
let $engine_type= NDB;
|
||||||
let $temp_engine_type= MEMORY;
|
let $temp_engine_type= MEMORY;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# Share test code between engine tests #
|
# Share test code between engine tests #
|
||||||
#########################################
|
#########################################
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
-- source extra/rpl_tests/rpl_delete_no_where.test
|
-- source extra/rpl_tests/rpl_delete_no_where.test
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
##########################################################
|
##########################################################
|
||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
##########################################################
|
##########################################################
|
||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Purpose: Wapper for rpl_extraSlave_Col.test
|
# Purpose: Wapper for rpl_extraSlave_Col.test
|
||||||
# Using NDB
|
# Using NDB
|
||||||
###########################################
|
###########################################
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type = 'NDB';
|
let $engine_type = 'NDB';
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
# reduce test case code #
|
# reduce test case code #
|
||||||
###################################
|
###################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
-- source extra/rpl_tests/rpl_row_func003.test
|
-- source extra/rpl_tests/rpl_row_func003.test
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# Wrapper for rpl_insert_ignore.test#
|
# Wrapper for rpl_insert_ignore.test#
|
||||||
#####################################
|
#####################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
let $engine_type2=myisam;
|
let $engine_type2=myisam;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
--source include/have_multi_ndb.inc
|
--source include/have_multi_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
# note: server2 is another "master" connected to the master cluster
|
# note: server2 is another "master" connected to the master cluster
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
# Run this only for row based replication, as replication of
|
# Run this only for row based replication, as replication of
|
||||||
# auto_increment values are not supported with NDB as storage engine
|
# auto_increment values are not supported with NDB as storage engine
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
|
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
# to reuse test code between engine runs #
|
# to reuse test code between engine runs #
|
||||||
############################################################
|
############################################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
-- source extra/rpl_tests/rpl_multi_update3.test
|
-- source extra/rpl_tests/rpl_multi_update3.test
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
##########################################################
|
##########################################################
|
||||||
|
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
|
# By JBM 2005-02-15 Wrapped to allow reuse of test code#
|
||||||
########################################################
|
########################################################
|
||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
-- source extra/rpl_tests/rpl_row_001.test
|
-- source extra/rpl_tests/rpl_row_001.test
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# For different engines #
|
# For different engines #
|
||||||
#################################
|
#################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDBCLUSTER;
|
let $engine_type=NDBCLUSTER;
|
||||||
-- source extra/rpl_tests/rpl_row_sp003.test
|
-- source extra/rpl_tests/rpl_row_sp003.test
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
# For different engines #
|
# For different engines #
|
||||||
#################################
|
#################################
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDBCLUSTER;
|
let $engine_type=NDBCLUSTER;
|
||||||
-- source extra/rpl_tests/rpl_row_sp006.test
|
-- source extra/rpl_tests/rpl_row_sp006.test
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
--source include/have_ndb.inc
|
--source include/have_ndb.inc
|
||||||
--source include/ndb_default_cluster.inc
|
--source include/ndb_default_cluster.inc
|
||||||
--source include/not_embedded.inc
|
--source include/not_embedded.inc
|
||||||
--source include/have_binlog_format_row.inc
|
--source include/have_binlog_format_mixed_or_row.inc
|
||||||
--source include/ndb_master-slave.inc
|
--source include/ndb_master-slave.inc
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
||||||
# Includes
|
# Includes
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
let $engine_type=NDB;
|
let $engine_type=NDB;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/have_ndbapi_examples.inc
|
-- source include/have_ndbapi_examples.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
-- source include/have_ndb.inc
|
-- source include/have_ndb.inc
|
||||||
-- source include/have_binlog_format_row.inc
|
-- source include/have_binlog_format_mixed_or_row.inc
|
||||||
-- source include/ndb_master-slave.inc
|
-- source include/ndb_master-slave.inc
|
||||||
|
|
||||||
let $type= 'NDB' ;
|
let $type= 'NDB' ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user