diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-15 12:31:40 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-11-15 12:31:40 +0100 |
| commit | f4f7e1f42c831152d750a0f159db7bae1b756601 (patch) | |
| tree | 0f0615c90cbc0bbeafeae2e1d15fc1782de21c79 /mysql-test/r | |
| parent | 6f97fb591b577b6766b4a3e9effb9766af49c311 (diff) | |
| parent | dc7bc68f7f699320ae08657acd60551b4a7b20aa (diff) | |
| download | mariadb-git-f4f7e1f42c831152d750a0f159db7bae1b756601.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31700/51-31700
mysql-test/r/log_tables.result:
Auto merged
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/log_tables.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index f3578598195..a31f2047670 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -830,20 +830,20 @@ INSERT INTO t1 VALUES (1,1,1); INSERT INTO t1 VALUES (2,2,2); INSERT INTO t1 VALUES (3,3,3); INSERT INTO t1 VALUES (4,4,4); -SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3 FROM t1 WHERE f3=4; -Bug#31700 - SCAN f1 f2 f3 -Bug#31700 - SCAN 4 4 4 -SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3 FROM t1 WHERE f2=3; -Bug#31700 - KEY f1 f2 f3 -Bug#31700 - KEY 3 3 3 -SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3 FROM t1 WHERE f1=2; -Bug#31700 - PK f1 f2 f3 -Bug#31700 - PK 2 2 2 +SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4; +Bug#31700 - SCAN f1 f2 f3 SLEEP(1.1) +Bug#31700 - SCAN 4 4 4 0 +SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f2=3; +Bug#31700 - KEY f1 f2 f3 SLEEP(1.1) +Bug#31700 - KEY 3 3 3 0 +SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2; +Bug#31700 - PK f1 f2 f3 SLEEP(1.1) +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; 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 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 - PK', f1,f2,f3 FROM t1 WHERE f1=2 +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,SLEEP(1.1) FROM t1 WHERE f2=3 +TIMESTAMP 1 1 SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2 DROP TABLE t1; TRUNCATE TABLE mysql.slow_log; SET GLOBAL slow_query_log = @old_slow_log_state; |