1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Merge branch 'merge-tokudb-5.6' into 10.0

This commit is contained in:
Sergei Golubchik
2015-12-15 20:13:09 +01:00
3128 changed files with 627416 additions and 217614 deletions

View File

@@ -0,0 +1,73 @@
include/master-slave.inc
Warnings:
Note #### Sending passwords in plain text without SSL/TLS is extremely insecure.
Note #### Storing MySQL user name or password information in the master info repository is not secure and is therefore not recommended. Please consider using the USER and PASSWORD connection options for START SLAVE; see the 'START SLAVE Syntax' in the MySQL Manual for more information.
[connection master]
call mtr.add_suppression('Slave: Error dropping database');
include/stop_slave.inc
start slave;
include/sync_slave_sql_with_master.inc
stop slave sql_thread;
insert into test0.benchmark set state='slave is processing load';
start slave sql_thread;
use test0;
insert into benchmark set state='slave ends load';
use test;
select * from test1.benchmark into outfile 'benchmark.out';
select ts from test0.benchmark where state like 'master started load' into @m_0;
select ts from test0.benchmark where state like 'master ends load' into @m_1;
select ts from test0.benchmark where state like 'slave takes on load' into @s_m0;
select ts from test0.benchmark where state like 'slave is supposed to finish with load' into @s_m1;
select ts from test0.benchmark where state like 'slave ends load' into @s_1;
select ts from test0.benchmark where state like 'slave is processing load' into @s_0;
select time_to_sec(@m_1) - time_to_sec(@m_0) as 'delta.out';
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test15.ti_nk, slave:test15.ti_nk]
include/diff_tables.inc [master:test15.ti_wk, slave:test15.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test14.ti_nk, slave:test14.ti_nk]
include/diff_tables.inc [master:test14.ti_wk, slave:test14.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test13.ti_nk, slave:test13.ti_nk]
include/diff_tables.inc [master:test13.ti_wk, slave:test13.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test12.ti_nk, slave:test12.ti_nk]
include/diff_tables.inc [master:test12.ti_wk, slave:test12.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test11.ti_nk, slave:test11.ti_nk]
include/diff_tables.inc [master:test11.ti_wk, slave:test11.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test10.ti_nk, slave:test10.ti_nk]
include/diff_tables.inc [master:test10.ti_wk, slave:test10.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test9.ti_nk, slave:test9.ti_nk]
include/diff_tables.inc [master:test9.ti_wk, slave:test9.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test8.ti_nk, slave:test8.ti_nk]
include/diff_tables.inc [master:test8.ti_wk, slave:test8.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test7.ti_nk, slave:test7.ti_nk]
include/diff_tables.inc [master:test7.ti_wk, slave:test7.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test6.ti_nk, slave:test6.ti_nk]
include/diff_tables.inc [master:test6.ti_wk, slave:test6.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test5.ti_nk, slave:test5.ti_nk]
include/diff_tables.inc [master:test5.ti_wk, slave:test5.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test4.ti_nk, slave:test4.ti_nk]
include/diff_tables.inc [master:test4.ti_wk, slave:test4.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test3.ti_nk, slave:test3.ti_nk]
include/diff_tables.inc [master:test3.ti_wk, slave:test3.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test2.ti_nk, slave:test2.ti_nk]
include/diff_tables.inc [master:test2.ti_wk, slave:test2.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test1.ti_nk, slave:test1.ti_nk]
include/diff_tables.inc [master:test1.ti_wk, slave:test1.ti_wk]
include/sync_slave_sql_with_master.inc
include/diff_tables.inc [master:test0.ti_nk, slave:test0.ti_nk]
include/diff_tables.inc [master:test0.ti_wk, slave:test0.ti_wk]
include/sync_slave_sql_with_master.inc
include/rpl_end.inc