diff options
| author | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
|---|---|---|
| committer | monty@mysql.com/narttu.mysql.fi <> | 2007-01-22 14:04:40 +0200 |
| commit | a04157fbb3f2b2e054c02968ffc82bb0eb971d58 (patch) | |
| tree | db1cb9732cc2b568c4a56c3f6d11cf8f4d5250b6 /sql/sql_load.cc | |
| parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
| parent | 9d3fda77c8e20ff299f9750b64c42dfbb58a7806 (diff) | |
| download | mariadb-git-a04157fbb3f2b2e054c02968ffc82bb0eb971d58.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 0e4057d9ae4..8aa3f96fb95 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -82,10 +82,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 @@ -486,6 +487,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, @@ -501,6 +504,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 |