MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Tatjana A Nuernberg Date:November 15 2007 11:30am
Subject:bk commit into 5.1 tree (tnurnberg:1.2641) BUG#31700
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-15 12:30:35+01:00, tnurnberg@stripped +2 -0
  Bug#31700: thd->examined_row_count not incremented for 'const' type queries
  
  tests adjusted for Windows

  mysql-test/r/log_tables.result@stripped, 2007-11-15 12:30:32+01:00, tnurnberg@stripped +12 -12
    Be more conservative in tests (for Windows)

  mysql-test/t/log_tables.test@stripped, 2007-11-15 12:30:32+01:00, tnurnberg@stripped +3 -3
    Be more conservative in tests (for Windows)

diff -Nrup a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result
--- a/mysql-test/r/log_tables.result	2007-11-10 21:51:46 +01:00
+++ b/mysql-test/r/log_tables.result	2007-11-15 12:30:32 +01:00
@@ -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;
diff -Nrup a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test
--- a/mysql-test/t/log_tables.test	2007-11-10 21:51:46 +01:00
+++ b/mysql-test/t/log_tables.test	2007-11-15 12:30:32 +01:00
@@ -942,9 +942,9 @@ 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;
-SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3 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 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4;
+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,SLEEP(1.1) FROM t1 WHERE f1=2;
 
 --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;
Thread
bk commit into 5.1 tree (tnurnberg:1.2641) BUG#31700Tatjana A Nuernberg15 Nov