mirror of
https://github.com/MariaDB/server.git
synced 2025-11-21 06:21:35 +03:00
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51 client/mysqldump.c: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/suite/binlog/r/binlog_multi_engine.result: Auto merged mysql-test/suite/binlog/t/binlog_multi_engine.test: Auto merged mysql-test/suite/ndb/r/ndb_read_multi_range.result: Auto merged mysql-test/suite/ndb/r/ndb_sp.result: Auto merged mysql-test/suite/ndb/r/ndb_trigger.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged mysql-test/suite/ndb/t/loaddata_autocom_ndb.test: Auto merged mysql-test/suite/ndb/t/ndb_alter_table.test: Auto merged mysql-test/suite/ndb/t/ndb_alter_table2.test: Auto merged mysql-test/suite/ndb/t/ndb_alter_table3.test: Auto merged mysql-test/suite/ndb/t/ndb_autodiscover.test: Auto merged mysql-test/suite/ndb/t/ndb_autodiscover2.test: Auto merged mysql-test/suite/ndb/t/ndb_autodiscover3.test: Auto merged mysql-test/suite/ndb/t/ndb_basic.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_ddl_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_log_bin.test: Auto merged mysql-test/suite/ndb/t/ndb_binlog_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_bitfield.test: Auto merged mysql-test/suite/ndb/t/ndb_blob.test: Auto merged mysql-test/suite/ndb/t/ndb_blob_partition.test: Auto merged mysql-test/suite/ndb/t/ndb_cache.test: Auto merged mysql-test/suite/ndb/t/ndb_cache2.test: Auto merged mysql-test/suite/ndb/t/ndb_cache_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_cache_multi2.test: Auto merged mysql-test/suite/ndb/t/ndb_charset.test: Auto merged mysql-test/suite/ndb/t/ndb_condition_pushdown.test: Auto merged mysql-test/suite/ndb/t/ndb_config.test: Auto merged mysql-test/suite/ndb/t/ndb_config2.test: Auto merged mysql-test/suite/ndb/t/ndb_cursor.test: Auto merged mysql-test/suite/ndb/t/ndb_database.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_alter.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_backuprestore.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_basic.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_ddl.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_disk2memory.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_dump.test: Auto merged mysql-test/suite/ndb/t/ndb_dd_sql_features.test: Auto merged mysql-test/suite/ndb/t/ndb_gis.test: Auto merged mysql-test/suite/ndb/t/ndb_index.test: Auto merged mysql-test/suite/ndb/t/ndb_index_ordered.test: Auto merged mysql-test/suite/ndb/t/ndb_index_unique.test: Auto merged mysql-test/suite/ndb/t/ndb_insert.test: Auto merged mysql-test/suite/ndb/t/ndb_limit.test: Auto merged mysql-test/suite/ndb/t/ndb_loaddatalocal.test: Auto merged mysql-test/suite/ndb/t/ndb_lock.test: Auto merged mysql-test/suite/ndb/t/ndb_minmax.test: Auto merged mysql-test/suite/ndb/t/ndb_multi.test: Auto merged mysql-test/suite/ndb/t/ndb_partition_error.test: Auto merged mysql-test/suite/ndb/t/ndb_partition_key.test: Auto merged mysql-test/suite/ndb/t/ndb_partition_list.test: Auto merged mysql-test/suite/ndb/t/ndb_partition_range.test: Auto merged mysql-test/suite/ndb/t/ndb_read_multi_range.test: Auto merged mysql-test/suite/ndb/t/ndb_rename.test: Auto merged mysql-test/suite/ndb/t/ndb_replace.test: Auto merged mysql-test/suite/ndb/t/ndb_restore.test: Auto merged mysql-test/suite/ndb/t/ndb_restore_partition.test: Auto merged mysql-test/suite/ndb/t/ndb_restore_print.test: Auto merged mysql-test/suite/ndb/t/ndb_row_format.test: Auto merged mysql-test/suite/ndb/t/ndb_single_user.test: Auto merged mysql-test/suite/ndb/t/ndb_sp.test: Auto merged mysql-test/suite/ndb/t/ndb_subquery.test: Auto merged mysql-test/suite/ndb/t/ndb_temporary.test: Auto merged mysql-test/suite/ndb/t/ndb_transaction.test: Auto merged mysql-test/suite/ndb/t/ndb_trigger.test: Auto merged mysql-test/suite/ndb/t/ndb_truncate.test: Auto merged mysql-test/suite/ndb/t/ndb_types.test: Auto merged mysql-test/suite/ndb/t/ndb_update.test: Auto merged mysql-test/suite/ndb/t/ndb_view.test: Auto merged mysql-test/suite/ndb/t/ndbapi.test: Auto merged mysql-test/suite/ndb/t/ps_7ndb.test: Auto merged mysql-test/suite/ndb/t/strict_autoinc_5ndb.test: Auto merged mysql-test/suite/rpl/r/rpl_events.result: Auto merged mysql-test/suite/rpl/r/rpl_replicate_do.result: Auto merged mysql-test/suite/rpl/r/rpl_row_UUID.result: Auto merged mysql-test/suite/rpl/r/rpl_sp.result: Auto merged mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Auto merged mysql-test/suite/rpl/r/rpl_trigger.result: Auto merged mysql-test/suite/rpl/r/rpl_view.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_UUID.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result: Auto merged mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_commit_afterflush.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb-master.opt: Auto merged mysql-test/suite/rpl_ndb/t/rpl_ndb_stm_innodb.test: Auto merged mysql-test/t/sp.test: Auto merged sql/Makefile.am: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged mysql-test/t/disabled.def: manual merge (Will need to follow up with moving a few test cases around post-merge)
191 lines
3.7 KiB
Plaintext
191 lines
3.7 KiB
Plaintext
-- source include/have_multi_ndb.inc
|
|
-- source include/have_binlog_format_row.inc
|
|
|
|
--disable_warnings
|
|
connection server2;
|
|
drop database if exists mysqltest;
|
|
drop table if exists t1,t2,t3;
|
|
connection server1;
|
|
drop database if exists mysqltest;
|
|
drop table if exists t1,t2,t3;
|
|
--connection server1
|
|
reset master;
|
|
--connection server2
|
|
reset master;
|
|
--enable_warnings
|
|
|
|
#
|
|
# basic test to see if ddl distribution works across
|
|
# multiple binlogs
|
|
#
|
|
|
|
# create database
|
|
--connection server1
|
|
create database mysqltest;
|
|
|
|
# create table
|
|
--connection server1
|
|
use mysqltest;
|
|
create table t1 (a int primary key) engine=ndb;
|
|
|
|
--connection server2
|
|
create table t2 (a int primary key) engine=ndb;
|
|
--source include/show_binlog_events2.inc
|
|
|
|
--connection server1
|
|
--source include/show_binlog_events2.inc
|
|
|
|
# alter table
|
|
--connection server1
|
|
reset master;
|
|
--connection server2
|
|
reset master;
|
|
|
|
--connection server2
|
|
alter table t2 add column (b int);
|
|
|
|
--connection server1
|
|
--source include/show_binlog_events2.inc
|
|
|
|
# alter database
|
|
--connection server1
|
|
reset master;
|
|
--connection server2
|
|
reset master;
|
|
|
|
--connection server2
|
|
ALTER DATABASE mysqltest CHARACTER SET latin1;
|
|
|
|
|
|
# having drop here instead of below sometimes triggers bug#18976
|
|
## drop table and drop should come after data events
|
|
--connection server2
|
|
drop table mysqltest.t1;
|
|
|
|
--connection server1
|
|
--source include/show_binlog_events2.inc
|
|
# to track down bug#18976
|
|
--real_sleep 10
|
|
--source include/show_binlog_events2.inc
|
|
|
|
#--connection server2
|
|
#drop table mysqltest.t1;
|
|
|
|
# drop database and drop should come after data events
|
|
--connection server1
|
|
reset master;
|
|
--connection server2
|
|
reset master;
|
|
|
|
--connection server1
|
|
use test;
|
|
insert into t2 values (1,2);
|
|
drop database mysqltest;
|
|
create table t1 (a int primary key) engine=ndb;
|
|
|
|
--connection server2
|
|
--source include/show_binlog_events2.inc
|
|
|
|
--connection server2
|
|
drop table t2;
|
|
|
|
# logfile groups and table spaces
|
|
--connection server1
|
|
reset master;
|
|
--connection server2
|
|
reset master;
|
|
|
|
--connection server1
|
|
CREATE LOGFILE GROUP lg1
|
|
ADD UNDOFILE 'undofile.dat'
|
|
INITIAL_SIZE 16M
|
|
UNDO_BUFFER_SIZE = 1M
|
|
ENGINE=NDB;
|
|
|
|
ALTER LOGFILE GROUP lg1
|
|
ADD UNDOFILE 'undofile02.dat'
|
|
INITIAL_SIZE = 4M
|
|
ENGINE=NDB;
|
|
|
|
CREATE TABLESPACE ts1
|
|
ADD DATAFILE 'datafile.dat'
|
|
USE LOGFILE GROUP lg1
|
|
INITIAL_SIZE 12M
|
|
ENGINE NDB;
|
|
|
|
ALTER TABLESPACE ts1
|
|
ADD DATAFILE 'datafile02.dat'
|
|
INITIAL_SIZE = 4M
|
|
ENGINE=NDB;
|
|
|
|
ALTER TABLESPACE ts1
|
|
DROP DATAFILE 'datafile.dat'
|
|
ENGINE = NDB;
|
|
|
|
ALTER TABLESPACE ts1
|
|
DROP DATAFILE 'datafile02.dat'
|
|
ENGINE = NDB;
|
|
|
|
DROP TABLESPACE ts1
|
|
ENGINE = NDB;
|
|
|
|
DROP LOGFILE GROUP lg1
|
|
ENGINE =NDB;
|
|
|
|
# having drop here instead of below sometimes triggers bug#18976
|
|
#drop table t1;
|
|
|
|
--connection server2
|
|
--source include/show_binlog_events2.inc
|
|
# to track down bug#18976
|
|
--real_sleep 10
|
|
--source include/show_binlog_events2.inc
|
|
|
|
drop table t1;
|
|
|
|
#
|
|
# Bug #17827 cluster: rename of several tables in one statement,
|
|
# gets multiply logged
|
|
#
|
|
--connection server1
|
|
reset master;
|
|
show tables;
|
|
--connection server2
|
|
reset master;
|
|
show tables;
|
|
|
|
--connection server1
|
|
create table t1 (a int key) engine=ndb;
|
|
create table t2 (a int key) engine=ndb;
|
|
create table t3 (a int key) engine=ndb;
|
|
rename table t3 to t4, t2 to t3, t1 to t2, t4 to t1;
|
|
--connection server2
|
|
--source include/show_binlog_events2.inc
|
|
|
|
drop table t1;
|
|
drop table t2;
|
|
drop table t3;
|
|
|
|
#
|
|
# Bug #17838 binlog not setup on seconday master after rename
|
|
#
|
|
#
|
|
--connection server1
|
|
reset master;
|
|
show tables;
|
|
--connection server2
|
|
reset master;
|
|
show tables;
|
|
|
|
--connection server1
|
|
create table t1 (a int key) engine=ndb;
|
|
insert into t1 values(1);
|
|
rename table t1 to t2;
|
|
insert into t2 values(2);
|
|
|
|
# now we should see data in table t1 _and_ t2
|
|
# prior to bug fix, data was missing for t2
|
|
--connection server2
|
|
drop table t2;
|
|
--source include/show_binlog_events2.inc
|