database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Resolving merge conflicts

Browse Source
This commit is contained in:
hf@deer.mysql.r18.ru
2002-12-12 12:49:56 +04:00
parent 0d77a0cafd dcb5293576
commit 3517febe97
27 changed files with 1724 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_base.cc
View File

@ -195,7 +195,6 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
DBUG_RETURN(open_list);
}
/*
Send name and type of result to client converted to a given char set
@ -216,6 +215,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
1 Error (Note that in this case the error is not sent to the client)
*/
#ifndef EMBEDDED_LIBRARY
bool
send_convert_fields(THD *thd,List<Item> &list,CONVERT *convert,uint flag)
{
@ -439,6 +440,7 @@ err:
DBUG_RETURN(1); /* purecov: inspected */
}
#endif /* EMBEDDED_LIBRARY */
/*****************************************************************************
* Functions to free open table cache