database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
This commit is contained in:
gkodinov/kgeorge@magare.gmz
2008-03-21 17:48:28 +02:00
parent 9d03658bf2 dff2a4c3a3
commit f6871c0d66
16 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_load.cc
View File

@@ -110,7 +110,7 @@ static bool write_execute_load_query_log_event(THD *thd,
TRUE - error / FALSE - success
*/
bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
List<Item> &fields_vars, List<Item> &set_fields,
List<Item> &set_values,
enum enum_duplicates handle_duplicates, bool ignore,