mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Huge pull
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-sql_error.cc~2f1caca8d2485dbe: Auto merged BitKeeper/deleted/.del-sql_prepare.cc~f703729793935ed6: Auto merged include/mysql.h: Auto merged include/violite.h: Auto merged libmysqld/embedded_priv.h: Auto merged libmysqld/lib_sql.cc: Auto merged libmysqld/lib_vio.c: Auto merged sql/field.h: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user