Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50

into  siva.hindu.god:/usr/home/tim/m/bk/b19764/51


mysql-test/r/union.result:
  Manual merge (use local)
sql/sql_lex.cc:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_parse.cc:
  Manual merge (use local)
sql/sql_prepare.cc:
  Manual merge (use local)
sql/sql_yacc.yy:
  SCCS merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/r/show_check.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge
mysql-test/t/show_check.test:
  Manual merge

4 files changed, 29 insertions, 1 deletions

diff --git a/mysql-test/t/ps-master.opt b/mysql-test/t/ps-master.opt
new file mode 100644
index 00000000000..3eb98fc3d6b
--- /dev/null
+++ b/mysql-test/t/ps-master.opt
@@ -0,0 +1 @@
+--log-slow-queries --log-long-format --log-queries-not-using-indexes
diff --git a/mysql-test/t/ps.test b/mysql-test/t/ps.test
index 902d8fcd9d8..62e2e9e8dd9 100644
--- a/mysql-test/t/ps.test
+++ b/mysql-test/t/ps.test
@@ -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.
 
 #
diff --git a/mysql-test/t/show_check-master.opt b/mysql-test/t/show_check-master.opt
new file mode 100644
index 00000000000..3eb98fc3d6b
--- /dev/null
+++ b/mysql-test/t/show_check-master.opt
@@ -0,0 +1 @@
+--log-slow-queries --log-long-format --log-queries-not-using-indexes
diff --git a/mysql-test/t/show_check.test b/mysql-test/t/show_check.test
index 553b3d9059b..7d4ad099e6f 100644
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@@ -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