diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2006-12-15 01:01:52 +0200 |
| commit | a6481aa4c7016c996a9787db4824307c705ec8a1 (patch) | |
| tree | b60f635d3126e8d0f1321f0187390d7cf8496558 /sql/sql_load.cc | |
| parent | 95564bfea31aef4686ae4e7c6d422e2a20a5d73a (diff) | |
| parent | 88dd873de0d5dc6e8f262268f925596a60b58704 (diff) | |
| download | mariadb-git-a6481aa4c7016c996a9787db4824307c705ec8a1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 018db006276..dfc998000da 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -83,10 +83,11 @@ static int read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, List<Item> &set_values, READ_INFO &read_info, String &enclosed, ulong skip_lines, bool ignore_check_option_errors); +#ifndef EMBEDDED_LIBRARY static bool write_execute_load_query_log_event(THD *thd, bool duplicates, bool ignore, bool transactional_table); - +#endif /* EMBEDDED_LIBRARY */ /* Execute LOAD DATA query @@ -487,6 +488,8 @@ err: } +#ifndef EMBEDDED_LIBRARY + /* Not a very useful function; just to avoid duplication of code */ static bool write_execute_load_query_log_event(THD *thd, bool duplicates, bool ignore, @@ -502,6 +505,7 @@ static bool write_execute_load_query_log_event(THD *thd, return mysql_bin_log.write(&e); } +#endif /**************************************************************************** ** Read of rows of fixed size + optional garage + optonal newline |