1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.

This commit is contained in:
unknown
2011-02-04 14:18:08 +01:00
130 changed files with 3402 additions and 538 deletions

View File

@ -0,0 +1,16 @@
perl;
$file = $ENV{'grep_file'};
$pattern = $ENV{'grep_pattern'};
open(FILE, "$file")
or die("Cannot open file $file: $!\n");
$lines = 0;
while(<FILE>) {
$lines++ if (/$pattern/);
}
print "$lines\n";
close(FILE);
EOF

View File

@ -0,0 +1 @@
--use_global_long_query_time --log_slow_verbosity="full"

View File

@ -0,0 +1,18 @@
show variables like 'use_global_long_query_time';
Variable_name Value
use_global_long_query_time ON
show variables like 'use_global_log_slow_control';
Variable_name Value
use_global_log_slow_control long_query_time
show variables like 'log_slow_verbosity';
Variable_name Value
log_slow_verbosity microtime,query_plan,innodb
show global variables like 'use_global_long_query_time';
Variable_name Value
use_global_long_query_time ON
show global variables like 'log_slow_verbosity';
Variable_name Value
log_slow_verbosity microtime,query_plan,innodb
show global variables like 'use_global_log_slow_control';
Variable_name Value
use_global_log_slow_control long_query_time

View File

@ -0,0 +1,6 @@
show variables like 'use_global_long_query_time';
show variables like 'use_global_log_slow_control';
show variables like 'log_slow_verbosity';
show global variables like 'use_global_long_query_time';
show global variables like 'log_slow_verbosity';
show global variables like 'use_global_log_slow_control';

View File

@ -0,0 +1 @@
--use_global_log_slow_control="long_query_time"

View File

@ -0,0 +1,12 @@
show variables like 'use_global_long_query_time';
Variable_name Value
use_global_long_query_time ON
show variables like 'use_global_log_slow_control';
Variable_name Value
use_global_log_slow_control long_query_time
show global variables like 'use_global_long_query_time';
Variable_name Value
use_global_long_query_time ON
show global variables like 'use_global_log_slow_control';
Variable_name Value
use_global_log_slow_control long_query_time

View File

@ -0,0 +1,4 @@
show variables like 'use_global_long_query_time';
show variables like 'use_global_log_slow_control';
show global variables like 'use_global_long_query_time';
show global variables like 'use_global_log_slow_control';

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1
--slow-query-log-file=percona_slow_query_log-control_global_slow.log --long-query-time=1

View File

@ -8,5 +8,5 @@ sleep(2)
0
set global use_global_log_slow_control=none;
set global log_slow_verbosity=microtime;
cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l
FLUSH LOGS;
1

View File

@ -5,6 +5,8 @@ set global use_global_log_slow_control="log_slow_verbosity,long_query_time";
SELECT sleep(2);
set global use_global_log_slow_control=none;
set global log_slow_verbosity=microtime;
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-control_global_slow.log | grep "No InnoDB statistics available for this query" | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-control_global_slow.log
--let grep_pattern = No InnoDB statistics available for this query
--source include/grep.inc

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1
--slow-query-log-file=percona_slow_query_log-log_slow_filter.log --long-query-time=1

View File

@ -21,5 +21,5 @@ SELECT sleep(2);
sleep(2)
0
drop table if exists t;
cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l
FLUSH LOGS;
2

View File

@ -26,6 +26,7 @@ SELECT sleep(2);
drop table if exists t;
--enable_warnings
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_filter.log | grep Query_time | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_filter.log
--let grep_pattern = Query_time
--source include/grep.inc

View File

@ -0,0 +1,3 @@
show global variables like 'log_slow_sp_statements';
Variable_name Value
log_slow_sp_statements ON

View File

@ -0,0 +1 @@
show global variables like 'log_slow_sp_statements';

View File

@ -0,0 +1,3 @@
show global variables like 'log_slow_timestamp_every';
Variable_name Value
log_slow_timestamp_every ON

View File

@ -0,0 +1 @@
show global variables like 'log_slow_timestamp_every';

View File

@ -0,0 +1 @@
--log_slow_verbosity="full"

View File

@ -0,0 +1,9 @@
show global variables like 'log_slow_verbosity';
Variable_name Value
log_slow_verbosity microtime,query_plan,innodb
show variables like 'log_slow_verbosity';
Variable_name Value
log_slow_verbosity microtime,query_plan,innodb
select @@log_slow_verbosity;
@@log_slow_verbosity
microtime,query_plan,innodb

View File

@ -0,0 +1,3 @@
show global variables like 'log_slow_verbosity';
show variables like 'log_slow_verbosity';
select @@log_slow_verbosity;

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1
--slow-query-log-file=percona_slow_query_log-log_slow_verbosity.log --long-query-time=1

View File

@ -5,5 +5,5 @@ set log_slow_verbosity=innodb;
SELECT sleep(2);
sleep(2)
0
cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l
FLUSH LOGS;
1

View File

@ -6,6 +6,7 @@ set log_slow_verbosity=innodb;
SELECT sleep(2);
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log | grep "No InnoDB statistics available for this query" | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-log_slow_verbosity.log
--let grep_pattern = No InnoDB statistics available for this query
--source include/grep.inc

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2
--slow-query-log-file=percona_slow_query_log-long_query_time.log --long-query-time=2

View File

@ -18,5 +18,5 @@ SELECT sleep(5);
sleep(5)
0
set long_query_time=2;
cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l
FLUSH LOGS;
3

View File

@ -12,6 +12,8 @@ SELECT sleep(5);
set long_query_time=2;
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-long_query_time.log | grep Query_time | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-long_query_time.log
--let grep_pattern = Query_time
--source include/grep.inc

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1
--slow-query-log-file=percona_slow_query_log-microseconds_in_slow_query_log.log --long-query-time=1

View File

@ -6,7 +6,6 @@ SELECT sleep(2);
sleep(2)
0
set global slow_query_log_microseconds_timestamp=OFF;
cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l
FLUSH LOGS;
1
cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+' | wc -l
2

View File

@ -8,10 +8,12 @@ SELECT sleep(2);
set global slow_query_log_microseconds_timestamp=OFF;
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+.[0-9]+' | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+.[0-9]+
--source include/grep.inc
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log
--let grep_pattern = # Time: [0-9]+[ ]+[0-9]+:[0-9]+:[0-9]+
--source include/grep.inc
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-microseconds_in_slow_query_log.log | grep -E '# Time: [0-9]+[ ]+[0-9]+:[0-\9]+:[0-9]+' | wc -l;
echo $cmd;
exec $cmd;

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1
--slow-query-log-file=percona_slow_query_log-min_examined_row_limit.log --long-query-time=1

View File

@ -21,5 +21,5 @@ SELECT sleep(2);
sleep(2)
0
drop table if exists t;
cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l
FLUSH LOGS;
2

View File

@ -26,6 +26,7 @@ SELECT sleep(2);
drop table if exists t;
--enable_warnings
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log | grep Query_time | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-min_examined_row_limit.log
--let grep_pattern = Query_time
--source include/grep.inc

View File

@ -18,4 +18,5 @@ STOP SLAVE;
START SLAVE;
INSERT INTO t SELECT t.id,t.data from t;
DROP TABLE IF EXISTS t;
FLUSH LOGS;
4

View File

@ -41,4 +41,8 @@ connection master;
DROP TABLE IF EXISTS t;
sync_slave_with_master;
exec cat var/mysqld.2/mysqld-slow.log | grep InnoDB_IO_r_ops | wc -l;
connection slave;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/mysqld-slow.log
--let grep_pattern = InnoDB_IO_r_ops
--source include/grep.inc

View File

@ -1 +1 @@
--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=1
--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=1

View File

@ -1 +1 @@
--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=1
--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=1

View File

@ -75,12 +75,14 @@ Variable_name Value
use_global_long_query_time ON
set global long_query_time=1;
set global use_global_long_query_time=0;
FLUSH LOGS;
# Analyse master slow_query_log
0
0
0
0
0
FLUSH LOGS;
# Analyse slave slow_query_log
0
0

View File

@ -75,26 +75,32 @@ show global variables like 'use_global_long_query_time';
set global long_query_time=1;
set global use_global_long_query_time=0;
connection master;
FLUSH LOGS;
-- echo # Analyse master slow_query_log
let $i=5;
let $k=1;
let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
while($i)
{
let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
exec $current_cmd;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
--let grep_pattern = INSERT INTO t VALUES \($k\)
--source include/grep.inc
dec $i;
inc $k;
}
connection slave;
FLUSH LOGS;
-- echo # Analyse slave slow_query_log
let $i=5;
let $k=1;
let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
while($i)
{
let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
exec $current_cmd;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
--let grep_pattern = INSERT INTO t VALUES \($k\)
--source include/grep.inc
dec $i;
inc $k;
}

View File

@ -1 +1 @@
--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=0
--slow-query-log-file=percona_log_slow_slave_statements-master.log --long-query-time=0

View File

@ -1 +1 @@
--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=0
--slow-query-log-file=percona_log_slow_slave_statements-slave.log --long-query-time=0

View File

@ -64,6 +64,7 @@ START SLAVE;
INSERT INTO t VALUES (7);
# Read information about master binlog
# Sync slave(7) thread
FLUSH LOGS;
# Analyse master slow_query_log
1
1
@ -72,6 +73,7 @@ INSERT INTO t VALUES (7);
1
1
1
FLUSH LOGS;
# Analyse slave slow_query_log
0
0

View File

@ -122,26 +122,32 @@ let $binlog_position = query_get_value(SHOW MASTER STATUS,Position,1);
connection slave;
let $sync_result = `SELECT MASTER_POS_WAIT('$binlog_file',$binlog_position)`;
connection master;
FLUSH LOGS;
-- echo # Analyse master slow_query_log
let $i=7;
let $k=1;
let $cmd=cat ./var/mysqld.1/data/percona_log_slow_slave_statements-master.log | grep;
while($i)
{
let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
exec $current_cmd;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_log_slow_slave_statements-master.log
--let grep_pattern = INSERT INTO t VALUES \($k\)
--source include/grep.inc
dec $i;
inc $k;
}
connection slave;
FLUSH LOGS;
-- echo # Analyse slave slow_query_log
let $i=7;
let $k=1;
let $cmd=cat ./var/mysqld.2/data/percona_log_slow_slave_statements-slave.log | grep;
while($i)
{
let $current_cmd = $cmd "INSERT INTO t VALUES ($k)" | wc -l;
exec $current_cmd;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.2/data/percona_log_slow_slave_statements-slave.log
--let grep_pattern = INSERT INTO t VALUES \($k\)
--source include/grep.inc
dec $i;
inc $k;
}

View File

@ -0,0 +1 @@
--slow_query_log_microseconds_timestamp

View File

@ -0,0 +1,3 @@
show global variables like 'slow_query_log_microseconds_timestamp';
Variable_name Value
slow_query_log_microseconds_timestamp ON

View File

@ -0,0 +1 @@
show global variables like 'slow_query_log_microseconds_timestamp';

View File

@ -0,0 +1,3 @@
show global variables like 'use_global_long_query_time';
Variable_name Value
use_global_long_query_time ON

View File

@ -0,0 +1 @@
show global variables like 'use_global_long_query_time';

View File

@ -1 +1 @@
--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --use_global_log_slow_control=long_query_time --use_global_long_query_time=1
--slow-query-log-file=percona_slow_query_log-use_global_long_query_time.log --long-query-time=2 --use_global_log_slow_control=long_query_time --use_global_long_query_time=1

View File

@ -20,7 +20,7 @@ sleep(5)
0
set global long_query_time=2;
set global use_global_long_query_time=0;
cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l
FLUSH LOGS;
3
show global variables like 'use_global_log_slow_control';
Variable_name Value

View File

@ -14,9 +14,10 @@ SELECT sleep(5);
set global long_query_time=2;
set global use_global_long_query_time=0;
let $cmd = cat var/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log | grep Query_time | wc -l;
echo $cmd;
exec $cmd;
FLUSH LOGS;
--let grep_file = $MYSQLTEST_VARDIR/mysqld.1/data/percona_slow_query_log-use_global_long_query_time.log
--let grep_pattern = Query_time
--source include/grep.inc
show global variables like 'use_global_log_slow_control';
show global variables like 'use_global_long_query_time';

View File

@ -1,23 +0,0 @@
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;
DROP TABLE IF EXISTS t;
CREATE TABLE t(id INT);
INSERT INTO t SELECT SLEEP(5);
STOP SLAVE;
select count(*) from t;
count(*)
0
SHOW SLAVE STATUS NOLOCK;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error
host user port 1 master-bin.000001 276 slave-relay-bin.000003 422 master-bin.000001 No No 0 0 276 577 None 0 No NULL No 0 0
select count(*) from t;
count(*)
0
START SLAVE;
Warnings:
Note 1592 Statement may not be safe to log in statement format.
DROP TABLE t;

View File

@ -1,28 +0,0 @@
--source include/master-slave.inc
connection master;
-- disable_warnings
DROP TABLE IF EXISTS t;
-- enable_warnings
CREATE TABLE t(id INT);
sync_slave_with_master;
connection master;
send INSERT INTO t SELECT SLEEP(5);
sleep 1;
connection slave;
send STOP SLAVE;
connection slave1;
select count(*) from t;
replace_column 2 host 3 user 4 port;
SHOW SLAVE STATUS NOLOCK;
select count(*) from t;
connection slave;
reap;
--source include/wait_for_slave_to_stop.inc
START SLAVE;
--source include/wait_for_slave_to_start.inc
connection master;
reap;
DROP TABLE t;
sync_slave_with_master;