diff options
| author | hf@genie.(none) <> | 2002-11-29 12:35:48 +0400 |
|---|---|---|
| committer | hf@genie.(none) <> | 2002-11-29 12:35:48 +0400 |
| commit | 5e8b27c0d3414244c31fec9242bad8225bee5b07 (patch) | |
| tree | 7aa1227117cb2c279c639fbe58eeace841422330 /sql/sql_base.cc | |
| parent | e1cb867968716584107645c2d90cf32b0b621106 (diff) | |
| parent | 25bd1e9a3702abe78d086d19b246a885c951f577 (diff) | |
| download | mariadb-git-5e8b27c0d3414244c31fec9242bad8225bee5b07.tar.gz | |
Pull conflicts resolutions
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index f8202035d51..666e5a7530e 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -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 |