diff options
| author | monty@donna.mysql.com <> | 2001-01-22 01:36:33 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-22 01:36:33 +0200 |
| commit | 8a9b1e9248aee8150abab64e1aa300328f377fbf (patch) | |
| tree | 6da5617fd9b81932be0de59e42834f024324f7a2 | |
| parent | b69ac0037fd4e65954ec686e55259725cc7122ab (diff) | |
| download | mariadb-git-8a9b1e9248aee8150abab64e1aa300328f377fbf.tar.gz | |
Fixed type in make_binary_distribution.sh
Don't convert field names in mysql_list_fields
| -rw-r--r-- | Docs/manual.texi | 3 | ||||
| -rw-r--r-- | scripts/make_binary_distribution.sh | 2 | ||||
| -rw-r--r-- | sql/sql_base.cc | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index ceeeb9ee0e4..c58d85d3c2e 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -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. diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh index a63c985913b..e07662d8102 100644 --- a/scripts/make_binary_distribution.sh +++ b/scripts/make_binary_distribution.sh @@ -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 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; |