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

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50


sql/sql_parse.cc:
  Auto merged

4 files changed, 3 insertions, 12 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 01db96291ff..788276ac654 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -173,7 +173,6 @@ void lex_start(THD *thd, uchar *buf,uint length)
   lex->spcont= NULL;
   lex->proc_list.first= 0;
   lex->escape_used= FALSE;
-  lex->is_show_command= FALSE;
   lex->reset_query_tables_list(FALSE);
 
   lex->nest_level=0 ;
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
index 1eae81732b7..fdf14c691e9 100644
--- a/sql/sql_lex.h
+++ b/sql/sql_lex.h
@@ -1016,13 +1016,6 @@ typedef struct st_lex : public Query_tables_list
   
   bool escape_used;
 
-  /*
-    Prevent SHOW commands from being written to the slow queries log.
-    This is fixed properly in MySQL 5.1, but a quick hack is used in 5.0
-    to achieve the same result.
-  */
-  bool is_show_command;
-
   st_lex();
 
   virtual ~st_lex()
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1159146af95..1b69e266442 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2150,10 +2150,10 @@ void log_slow_statement(THD *thd)
   thd->end_time();				// Set start time
 
   /*
-    Do not log administrative or SHOW statements unless the appropriate
-    option is set; do not log into slow log if reading from backup.
+    Do not log administrative statements unless the appropriate option is
+    set; do not log into slow log if reading from backup.
   */
-  if (thd->enable_slow_log && !thd->user_time && !thd->lex->is_show_command)
+  if (thd->enable_slow_log && !thd->user_time)
   {
     thd->proc_info="logging slow query";
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 3d31b37062c..cb105d05332 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -6412,7 +6412,6 @@ opt_table_sym:
 show:	SHOW
 	{
 	  LEX *lex=Lex;
-          lex->is_show_command= TRUE;
 	  lex->wild=0;
           lex->lock_option= TL_READ;
           mysql_init_select(lex);