mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Merge 5.1 main -> 5.1-rpl
This commit is contained in:
@@ -9,6 +9,7 @@ BEGIN;
|
||||
INSERT INTO t1 VALUES (1);
|
||||
OPTIMIZE TABLE t1;
|
||||
Table Op Msg_type Msg_text
|
||||
test.t1 optimize note Table does not support optimize, doing recreate + analyze instead
|
||||
test.t1 optimize error Lock wait timeout exceeded; try restarting transaction
|
||||
test.t1 optimize status Operation failed
|
||||
Warnings:
|
||||
|
@@ -570,6 +570,7 @@ test_rpl.t1 1837058639
|
||||
******************** OPTIMIZE TABLE ********************
|
||||
OPTIMIZE TABLE t1;
|
||||
Table Op Msg_type Msg_text
|
||||
test_rpl.t1 optimize note Table does not support optimize, doing recreate + analyze instead
|
||||
test_rpl.t1 optimize status OK
|
||||
|
||||
******************** REPAIR TABLE ********************
|
||||
|
36
mysql-test/suite/rpl/r/rpl_plugin_load.result
Normal file
36
mysql-test/suite/rpl/r/rpl_plugin_load.result
Normal file
@@ -0,0 +1,36 @@
|
||||
stop slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
reset master;
|
||||
reset slave;
|
||||
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
||||
start slave;
|
||||
Verify that example engine is not installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
Get binlog position before install plugin.
|
||||
Install example engine.
|
||||
INSTALL PLUGIN example SONAME 'ha_example.so';
|
||||
Get binlog position after install plugin.
|
||||
Compute the difference of the binlog positions.
|
||||
Should be zero as install plugin should not be replicated.
|
||||
Delta
|
||||
0
|
||||
Verify that example engine is installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
EXAMPLE YES Example storage engine NO NO NO
|
||||
connection slave: Verify that example engine is not installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
connection master: Uninstall example engine.
|
||||
Get binlog position before uninstall plugin.
|
||||
UNINSTALL PLUGIN example;
|
||||
Get binlog position after uninstall plugin.
|
||||
Compute the difference of the binlog positions.
|
||||
Should be zero as uninstall plugin should not be replicated.
|
||||
Delta
|
||||
0
|
||||
Verify that example engine is not installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
|
||||
End of test
|
1
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_plugin_load-master.opt
Normal file
@@ -0,0 +1 @@
|
||||
$EXAMPLE_PLUGIN_OPT
|
1
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_plugin_load-slave.opt
Normal file
@@ -0,0 +1 @@
|
||||
$EXAMPLE_PLUGIN_OPT
|
60
mysql-test/suite/rpl/t/rpl_plugin_load.test
Normal file
60
mysql-test/suite/rpl/t/rpl_plugin_load.test
Normal file
@@ -0,0 +1,60 @@
|
||||
#
|
||||
# Bug#35807 - INSTALL PLUGIN replicates row-based, but not stmt-based
|
||||
#
|
||||
# The test verifies that INSTALL PLUGIN and UNINSTALL PLUGIN
|
||||
# work with replication.
|
||||
#
|
||||
# The test tries to install and uninstall a plugin on master,
|
||||
# and verifies that it does not affect the slave,
|
||||
# and that it does not add anything to the binlog.
|
||||
|
||||
--source include/not_embedded.inc
|
||||
--source include/have_log_bin.inc
|
||||
# Dynamic loading of Example does not work on Windows currently.
|
||||
--source include/not_windows.inc
|
||||
--source include/have_example_plugin.inc
|
||||
|
||||
# Initialize replication.
|
||||
--source include/master-slave.inc
|
||||
--echo Verify that example engine is not installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
--echo Get binlog position before install plugin.
|
||||
let $before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
|
||||
--echo Install example engine.
|
||||
INSTALL PLUGIN example SONAME 'ha_example.so';
|
||||
--echo Get binlog position after install plugin.
|
||||
let $after_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
|
||||
--echo Compute the difference of the binlog positions.
|
||||
--echo Should be zero as install plugin should not be replicated.
|
||||
--disable_query_log
|
||||
eval SELECT $after_pos - $before_pos AS Delta;
|
||||
--enable_query_log
|
||||
--echo Verify that example engine is installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
# Wait for slave to catch up with master.
|
||||
sync_slave_with_master;
|
||||
#
|
||||
--echo connection slave: Verify that example engine is not installed.
|
||||
connection slave;
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
#
|
||||
--echo connection master: Uninstall example engine.
|
||||
connection master;
|
||||
--echo Get binlog position before uninstall plugin.
|
||||
let $before_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
|
||||
UNINSTALL PLUGIN example;
|
||||
--echo Get binlog position after uninstall plugin.
|
||||
let $after_pos = query_get_value("SHOW MASTER STATUS", Position, 1);
|
||||
--echo Compute the difference of the binlog positions.
|
||||
--echo Should be zero as uninstall plugin should not be replicated.
|
||||
--disable_query_log
|
||||
eval SELECT $after_pos - $before_pos AS Delta;
|
||||
--enable_query_log
|
||||
--echo Verify that example engine is not installed.
|
||||
SELECT * FROM INFORMATION_SCHEMA.ENGINES WHERE ENGINE='EXAMPLE';
|
||||
# Wait for slave to catch up with master.
|
||||
sync_slave_with_master;
|
||||
#
|
||||
# Cleanup
|
||||
--source include/master-slave-end.inc
|
||||
--echo End of test
|
1
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
Normal file
@@ -0,0 +1 @@
|
||||
--binlog-format=row
|
1
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
Normal file
@@ -0,0 +1 @@
|
||||
--binlog-format=statement --log-slave-updates
|
1
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
Normal file
1
mysql-test/suite/rpl/t/rpl_truncate_7ndb_2-master.opt
Normal file
@@ -0,0 +1 @@
|
||||
--binlog-format=mixed
|
Reference in New Issue
Block a user