Merge work.mysql.com:/home/bk/mysql

into work.mysql.com:/d1/users/tim/my/work


BitKeeper/etc/logging_ok:
  auto-union

1 files changed, 4 insertions, 2 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 28f509d3c81..d69bc905c31 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -187,7 +187,8 @@ query_table_status(THD *thd,const char *db,const char *table_name)
 ** Sum fields has table name empty and field_name.
 ** flag is a bit mask with the following functions:
 **   1 send number of rows
-**   2 send default values;  Don't convert field names
+**   2 send default values
+**   4 Don't convert field names
 ******************************************************************************/
 
 bool
@@ -196,7 +197,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
   List_iterator<Item> it(list);
   Item *item;
   char buff[80];
-  CONVERT *convert= (flag & 2) ? (CONVERT*) 0 : thd->convert_set;
+  CONVERT *convert= (flag & 4) ? (CONVERT*) 0 : thd->convert_set;
 
   String tmp((char*) buff,sizeof(buff)),*res,*packet= &thd->packet;
 
@@ -1166,6 +1167,7 @@ bool wait_for_tables(THD *thd)
     /* Now we can open all tables without any interference */
     thd->proc_info="Reopen tables";
     result=reopen_tables(thd,0,0);
+     
   }
   pthread_mutex_unlock(&LOCK_open);
   thd->proc_info=0;