bk commit into 5.1 tree (tsmith:1.2356) BUG#19764

[tim]

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-09 17:13:17-06:00, tsmith@stripped +6 -0
  Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50
  into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51
  
  Null-merge of code changes, but keep test case from 5.0 for bug #19764
  MERGE: 1.1810.2173.1

  mysql-test/r/show_check.result@stripped, 2006-10-09 17:13:13-06:00, tsmith@stripped
+0 -2
    Manual merge
    MERGE: 1.75.1.4

  mysql-test/t/show_check.test@stripped, 2006-10-09 17:13:13-06:00, tsmith@stripped +1
-4
    Manual merge
    MERGE: 1.54.1.5

  sql/sql_lex.cc@stripped, 2006-10-09 17:07:50-06:00, tsmith@stripped +0 -1
    Manual merge (use local)
    MERGE: 1.142.1.60

  sql/sql_lex.h@stripped, 2006-10-09 17:08:08-06:00, tsmith@stripped +0 -7
    Manual merge (use local)
    MERGE: 1.175.1.54

  sql/sql_parse.cc@stripped, 2006-10-09 17:08:22-06:00, tsmith@stripped +3 -3
    Manual merge (use local)
    MERGE: 1.426.108.1

  sql/sql_yacc.yy@stripped, 2006-10-09 17:10:57-06:00, tsmith@stripped +0 -1
    Manual merge (use local)
    MERGE: 1.371.1.121

# 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/tmp/51/RESYNC

--- 1.103/mysql-test/r/show_check.result	2006-10-09 17:13:26 -06:00
+++ 1.104/mysql-test/r/show_check.result	2006-10-09 17:13:26 -06:00
@@ -672,6 +672,21 @@ 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
+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;

--- 1.68/mysql-test/t/show_check.test	2006-10-09 17:13:26 -06:00
+++ 1.69/mysql-test/t/show_check.test	2006-10-09 17:13:26 -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