bk commit into 5.0 tree (gluh:1.1895) BUG#11685

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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
  1.1895 05/07/07 14:15:30 gluh@stripped +2 -0
  Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables

  sql/sql_parse.cc
    1.442 05/07/07 14:15:25 gluh@stripped +5 -2
    Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables

  mysql-test/r/information_schema.result
    1.60 05/07/07 14:15:25 gluh@stripped +1 -1
    Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tables

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.441/sql/sql_parse.cc	Mon Jul  4 05:44:31 2005
+++ 1.442/sql/sql_parse.cc	Thu Jul  7 14:15:25 2005
@@ -2193,6 +2193,8 @@
   TABLE_LIST *table_list= (TABLE_LIST*) select_lex->table_list.first;
   table_list->schema_select_lex= sel;
   table_list->schema_table_reformed= 1;
+  statistic_increment(thd->status_var.com_stat[lex->orig_sql_command],
+                      &LOCK_status);
   DBUG_RETURN(0);
 }
 
@@ -2366,9 +2368,10 @@
     my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
     DBUG_RETURN(-1);
   }
+  if(lex->orig_sql_command == SQLCOM_END)
+    statistic_increment(thd->status_var.com_stat[lex->sql_command],
+                        &LOCK_status);
 
-  statistic_increment(thd->status_var.com_stat[lex->sql_command],
-		      &LOCK_status);
   switch (lex->sql_command) {
   case SQLCOM_SELECT:
   {

--- 1.59/mysql-test/r/information_schema.result	Wed Jul  6 03:24:32 2005
+++ 1.60/mysql-test/r/information_schema.result	Thu Jul  7 14:15:25 2005
@@ -674,7 +674,7 @@
 mysql	user	0	0
 show status where variable_name like "%database%";
 Variable_name	Value
-Com_show_databases	0
+Com_show_databases	3
 show variables where variable_name like "skip_show_databas";
 Variable_name	Value
 show global status like "Threads_running";