Commit 8a9b1e92 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Fixed type in make_binary_distribution.sh 

Don't convert field names in mysql_list_fields
parent b69ac003

Docs/manual.texi

+3 −0
Original line number Diff line number Diff line
@@ -40712,6 +40712,9 @@ not yet 100 % confident in this code. 
@appendixsubsec Changes in release 3.23.32

@itemize @bullet

@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.

@item

Fixed problem with @code{SET PASSWORD=...} on windows.

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ for i in libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* libmy 
do

  if [ -f $i ]

  then

    cp -p $i $BASE/bin

    cp -p $i $BASE/lib

   fi

done

sql/sql_base.cc

+4 −1
Original line number Diff line number Diff line
@@ -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;