Merge alik.:/mnt/raid/alik/MySQL/devel/5.1

into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/kill.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/time.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manually merged.
sql/sql_parse.cc:
  Manually merged.

1 files changed, 40 insertions, 8 deletions

diff --git a/mysql-test/r/ps.result b/mysql-test/r/ps.result
index 58bcc2b4d8d..617e289d30d 100644
--- a/mysql-test/r/ps.result
+++ b/mysql-test/r/ps.result
@@ -1478,6 +1478,23 @@ i
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2;
 DROP PROCEDURE IF EXISTS p1;
+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();
@@ -1619,54 +1636,62 @@ flush tables;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 call proc_1();
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 flush tables;
 create function func_1() returns int begin flush tables; return 1; end|
 ERROR 0A000: FLUSH is not allowed in stored function or trigger
@@ -1682,49 +1707,56 @@ select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 prepare abc from "flush tables";
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 execute abc;
 show open tables from mysql;
 Database	Table	In_use	Name_locked
 mysql	general_log	1	0
+mysql	slow_log	1	0
 select Host, User from mysql.user limit 0;
 Host	User
 select Host, Db from mysql.host limit 0;
 Host	Db
 show open tables from mysql;
 Database	Table	In_use	Name_locked
-mysql	user	0	0
 mysql	general_log	1	0
+mysql	slow_log	1	0
 mysql	host	0	0
+mysql	user	0	0
 flush tables;
 deallocate prepare abc;
 create procedure proc_1() flush logs;