MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tim Date:October 17 2006 12:42am
Subject:bk commit into 5.1 tree (tsmith:1.2376)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim 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, 2006-10-16 18:42:22-06:00, tsmith@stripped +10 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
  into  siva.hindu.god:/usr/home/tim/m/bk/b19764/51
  MERGE: 1.1810.2175.3

  mysql-test/r/ps.result@stripped, 2006-10-16 18:42:17-06:00, tsmith@stripped +17 -17
    Manual merge
    MERGE: 1.56.5.1

  mysql-test/r/show_check.result@stripped, 2006-10-16 18:42:17-06:00, tsmith@stripped +0 -2
    Manual merge
    MERGE: 1.75.1.6

  mysql-test/r/union.result@stripped, 2006-10-16 18:31:53-06:00, tsmith@stripped +0 -4
    Manual merge (use local)
    MERGE: 1.80.1.7

  mysql-test/t/ps.test@stripped, 2006-10-16 18:42:17-06:00, tsmith@stripped +14 -14
    Manual merge
    MERGE: 1.56.5.1

  mysql-test/t/show_check.test@stripped, 2006-10-16 18:42:17-06:00, tsmith@stripped +1 -4
    Manual merge
    MERGE: 1.54.1.7

  sql/sql_lex.cc@stripped, 2006-10-16 18:36:29-06:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.142.1.61

  sql/sql_lex.h@stripped, 2006-10-16 18:36:40-06:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.175.1.55

  sql/sql_parse.cc@stripped, 2006-10-16 18:36:56-06:00, tsmith@stripped +2 -4
    Manual merge (use local)
    MERGE: 1.426.109.3

  sql/sql_prepare.cc@stripped, 2006-10-16 18:37:13-06:00, tsmith@stripped +0 -6
    Manual merge (use local)
    MERGE: 1.142.18.1

  sql/sql_yacc.yy@stripped, 2006-10-16 18:37:51-06:00, tsmith@stripped +0 -0
    SCCS merged
    MERGE: 1.371.1.122

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/b19764/51/RESYNC

--- 1.103/mysql-test/r/show_check.result	2006-10-16 18:42:37 -06:00
+++ 1.104/mysql-test/r/show_check.result	2006-10-16 18:42:37 -06:00
@@ -672,7 +672,22 @@ SHOW TABLES FROM no_such_database;
 ERROR 42000: Unknown database 'no_such_database'
 SHOW COLUMNS FROM no_such_table;
 ERROR 42S02: Table 'test.no_such_table' doesn't exist
-End of 5.0 tests.
+flush status;
+show status like 'slow_queries';
+Variable_name  Value
+Slow_queries 0
+show tables;
+Tables_in_test
+show status like 'slow_queries';
+Variable_name  Value
+Slow_queries 0
+select 1 from information_schema.tables limit 1;
+1
+1
+show status like 'slow_queries';
+Variable_name  Value
+Slow_queries 1
+End of 5.0 tests
 SHOW AUTHORS;
 create database mysqltest;
 show create database mysqltest;

--- 1.68/mysql-test/t/show_check.test	2006-10-16 18:42:37 -06:00
+++ 1.69/mysql-test/t/show_check.test	2006-10-16 18:42:37 -06:00
@@ -501,7 +501,19 @@ SHOW TABLES FROM no_such_database;
 --error ER_NO_SUCH_TABLE
 SHOW COLUMNS FROM no_such_table;
 
-# End of 5.0 tests.
+
+#
+# Bug #19764: SHOW commands end up in the slow log as table scans
+#
+flush status;
+show status like 'slow_queries';
+show tables;
+show status like 'slow_queries';
+# Table scan query, to ensure that slow_queries does still get incremented
+# (mysqld is started with --log-queries-not-using-indexes)
+select 1 from information_schema.tables limit 1;
+show status like 'slow_queries';
+
 --echo End of 5.0 tests.
 
 --disable_result_log

--- 1.80/mysql-test/r/ps.result	2006-10-16 18:42:37 -06:00
+++ 1.81/mysql-test/r/ps.result	2006-10-16 18:42:37 -06:00
@@ -1379,6 +1379,23 @@ i
 1
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2;
+flush status;
+prepare sq from 'show status like "slow_queries"';
+execute sq;
+Variable_name	Value
+Slow_queries	0
+prepare no_index from 'select 1 from information_schema.tables limit 1';
+execute sq;
+Variable_name	Value
+Slow_queries	0
+execute no_index;
+1
+1
+execute sq;
+Variable_name	Value
+Slow_queries	1
+deallocate prepare no_index;
+deallocate prepare sq;
 End of 5.0 tests.
 create procedure proc_1() reset query cache;
 call proc_1();

--- 1.79/mysql-test/t/ps.test	2006-10-16 18:42:37 -06:00
+++ 1.80/mysql-test/t/ps.test	2006-10-16 18:42:37 -06:00
@@ -1437,6 +1437,20 @@ DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2;
 
 
+#
+# Bug 19764:  SHOW commands end up in the slow log as table scans
+#
+
+flush status;
+prepare sq from 'show status like "slow_queries"';
+execute sq;
+prepare no_index from 'select 1 from information_schema.tables limit 1';
+execute sq;
+execute no_index;
+execute sq;
+deallocate prepare no_index;
+deallocate prepare sq;
+
 --echo End of 5.0 tests.
 
 #
Thread
bk commit into 5.1 tree (tsmith:1.2376)tim17 Oct