Commit 6c367019 authored by unknown's avatar unknown

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()
parent 2becf096
...@@ -40712,6 +40712,9 @@ not yet 100 % confident in this code. ...@@ -40712,6 +40712,9 @@ not yet 100 % confident in this code.
@appendixsubsec Changes in release 3.23.32 @appendixsubsec Changes in release 3.23.32
@itemize @bullet @itemize @bullet
@item @item
Don't convert field names when using @code{mysql_list_fields()}. This is
to keep this code compatible with @code{SHOW FIELDS}.
@item
@code{MERGE} tables didn't work on windows. @code{MERGE} tables didn't work on windows.
@item @item
Fixed problem with @code{SET PASSWORD=...} on windows. Fixed problem with @code{SET PASSWORD=...} on windows.
...@@ -87,7 +87,7 @@ for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmy ...@@ -87,7 +87,7 @@ for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmy
do do
if [ -f $i ] if [ -f $i ]
then then
cp -p $i $BASE/bin cp -p $i $BASE/lib
fi fi
done done
......
...@@ -185,6 +185,9 @@ query_table_status(THD *thd,const char *db,const char *table_name) ...@@ -185,6 +185,9 @@ query_table_status(THD *thd,const char *db,const char *table_name)
/****************************************************************************** /******************************************************************************
** Send name and type of result to client. ** Send name and type of result to client.
** Sum fields has table name empty and field_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
******************************************************************************/ ******************************************************************************/
bool bool
...@@ -193,7 +196,7 @@ send_fields(THD *thd,List<Item> &list,uint flag) ...@@ -193,7 +196,7 @@ send_fields(THD *thd,List<Item> &list,uint flag)
List_iterator<Item> it(list); List_iterator<Item> it(list);
Item *item; Item *item;
char buff[80]; 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; String tmp((char*) buff,sizeof(buff)),*res,*packet= &thd->packet;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment