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

1 files changed, 16 insertions, 1 deletions

diff --git a/mysql-test/r/show_check.result b/mysql-test/r/show_check.result
index b473bbac923..3836148faa9 100644
--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@@ -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;