Fixed type in make_binary_distribution.sh

Don't convert field names in mysql_list_fields


Docs/manual.texi:
  Changelog
scripts/make_binary_distribution.sh:
  Fix typo
sql/sql_base.cc:
  Don't convert field names in mysql_list_fields()

1 files changed, 4 insertions, 1 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 8425fb2d75a..28f509d3c81 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -185,6 +185,9 @@ query_table_status(THD *thd,const char *db,const char *table_name)
 /******************************************************************************
 ** Send name and type of result to client.
 ** 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
 ******************************************************************************/
 
 bool
@@ -193,7 +196,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
   List_iterator<Item> it(list);
   Item *item;
   char buff[80];
-  CONVERT *convert=thd->convert_set;
+  CONVERT *convert= (flag & 2) ? (CONVERT*) 0 : thd->convert_set;
 
   String tmp((char*) buff,sizeof(buff)),*res,*packet= &thd->packet;