1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

5.3 merge

This commit is contained in:
Sergei Golubchik
2012-05-21 20:54:41 +02:00
44 changed files with 1059 additions and 73 deletions

View File

@ -2,13 +2,6 @@
# Basic tests of row-level logging
#
--disable_query_log
--disable_result_log
# Add suppression for expected warning(s) in error log
call mtr.add_suppression("Can't find record in 't.'");
--enable_query_log
--enable_result_log
#
# First we test tables with only an index.
#
@ -16,11 +9,11 @@ call mtr.add_suppression("Can't find record in 't.'");
#BUG#12662190 - COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM_BEGIN IS
#Testing command counters -BEFORE
#Storing the before counts of Slave
sync_slave_with_master;
connection slave;
create temporary table stats
select variable_name as n, -variable_value as v from information_schema.global_status
where variable_name in ('com_commit','com_insert','com_delete','com_update');
let $slave_com_commit_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_commit', Value, 1);
let $slave_com_insert_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_insert', Value, 1);
let $slave_com_delete_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_delete', Value, 1);
let $slave_com_update_before= query_get_value(SHOW GLOBAL STATUS LIKE 'com_update', Value, 1);
connection master;
eval CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)$extra_index_t1) ENGINE = $type ;
@ -60,11 +53,27 @@ SELECT * FROM t1 ORDER BY C1,C2;
#Testing command counters -AFTER
#Storing the after counts of Slave
connection slave;
let $slave_com_commit_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_commit', Value, 1);
let $slave_com_insert_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_insert', Value, 1);
let $slave_com_delete_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_delete', Value, 1);
let $slave_com_update_after= query_get_value(SHOW GLOBAL STATUS LIKE 'com_update', Value, 1);
insert stats
select variable_name, variable_value from information_schema.global_status
where variable_name in ('com_commit','com_insert','com_delete','com_update');
select n, sum(v) from stats group by n;
#Commit count check
--let $assert_text= Counter for COM_COMMIT is consistent with the number of actual commits
--let $assert_cond= $slave_com_commit_after - $slave_com_commit_before = 4
--source include/assert.inc
#Insert count check
--let $assert_text= Counter for COM_INSERT is consistent with the number of actual inserts
--let $assert_cond= $slave_com_insert_after - $slave_com_insert_before = 2
--source include/assert.inc
#Delete count check
--let $assert_text= Counter for COM_DELETE is consistent with the number of actual deletes
--let $assert_cond= $slave_com_delete_after - $slave_com_delete_before = 1
--source include/assert.inc
#Update count check
--let $assert_text= Counter for COM_UPDATE is consistent with the number of actual updates
--let $assert_cond= $slave_com_update_after - $slave_com_update_before = 1
--source include/assert.inc
# Testing update with a condition that does not match any rows, but
# which has a match for the index.