Skip to content

M
mariadb
Commit f7876a2c authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files
Options

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/B31928-5.1-opt
parents 092e7803 074a1dbd
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
mysql-test/r/log_tables.result
View file @ f7876a2c
...@@ -830,20 +830,20 @@ INSERT INTO t1 VALUES (1,1,1); ...@@ -830,20 +830,20 @@ INSERT INTO t1 VALUES (1,1,1);
INSERT INTO t1 VALUES (2,2,2); INSERT INTO t1 VALUES (2,2,2);
INSERT INTO t1 VALUES (3,3,3); INSERT INTO t1 VALUES (3,3,3);
INSERT INTO t1 VALUES (4,4,4); INSERT INTO t1 VALUES (4,4,4);
SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3 FROM t1 WHERE f3=4; SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4;
Bug#31700 - SCAN f1 f2 f3 Bug#31700 - SCAN f1 f2 f3 SLEEP(1.1)
Bug#31700 - SCAN 4 4 4 Bug#31700 - SCAN 4 4 4 0
SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3 FROM t1 WHERE f2=3; SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f2=3;
Bug#31700 - KEY f1 f2 f3 Bug#31700 - KEY f1 f2 f3 SLEEP(1.1)
Bug#31700 - KEY 3 3 3 Bug#31700 - KEY 3 3 3 0
SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3 FROM t1 WHERE f1=2; SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2;
Bug#31700 - PK f1 f2 f3 Bug#31700 - PK f1 f2 f3 SLEEP(1.1)
Bug#31700 - PK 2 2 2 Bug#31700 - PK 2 2 2 0
SELECT start_time, rows_examined, rows_sent, sql_text FROM mysql.slow_log WHERE sql_text LIKE '%Bug#31700%' ORDER BY start_time; SELECT start_time, rows_examined, rows_sent, sql_text FROM mysql.slow_log WHERE sql_text LIKE '%Bug#31700%' ORDER BY start_time;
start_time rows_examined rows_sent sql_text start_time rows_examined rows_sent sql_text
TIMESTAMP 4 1 SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3 FROM t1 WHERE f3=4 TIMESTAMP 4 1 SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4
TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3 FROM t1 WHERE f2=3 TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f2=3
TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3 FROM t1 WHERE f1=2 TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2
DROP TABLE t1; DROP TABLE t1;
TRUNCATE TABLE mysql.slow_log; TRUNCATE TABLE mysql.slow_log;
SET GLOBAL slow_query_log = @old_slow_log_state; SET GLOBAL slow_query_log = @old_slow_log_state;
......
mysql-test/t/log_tables.test
View file @ f7876a2c
...@@ -942,9 +942,9 @@ INSERT INTO t1 VALUES (2,2,2); ...@@ -942,9 +942,9 @@ INSERT INTO t1 VALUES (2,2,2);
INSERT INTO t1 VALUES (3,3,3); INSERT INTO t1 VALUES (3,3,3);
INSERT INTO t1 VALUES (4,4,4); INSERT INTO t1 VALUES (4,4,4);
SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3 FROM t1 WHERE f3=4; SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4;
SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3 FROM t1 WHERE f2=3; SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f2=3;
SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3 FROM t1 WHERE f1=2; SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2;
--replace_column 1 TIMESTAMP --replace_column 1 TIMESTAMP
SELECT start_time, rows_examined, rows_sent, sql_text FROM mysql.slow_log WHERE sql_text LIKE '%Bug#31700%' ORDER BY start_time; SELECT start_time, rows_examined, rows_sent, sql_text FROM mysql.slow_log WHERE sql_text LIKE '%Bug#31700%' ORDER BY start_time;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7