database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Resolving merge conflicts

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
include/mysql.h:
  Auto merged
sql/convert.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
sql/item_strfunc.cc:
  merging
This commit is contained in:
unknown
2002-12-12 12:49:56 +04:00
parent 4ed872632e a9f1388b54
commit e9525947d4
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