diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-09-07 15:14:32 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-09-07 15:14:32 +0300 |
| commit | c7601db62e128677c0e4a7f752ec0073ead85ce6 (patch) | |
| tree | be7b1a2d3f4e095333e132c4c05dff1654b94589 /sql/sql_load.cc | |
| parent | 1211032c85d42811b832857d15262e3e92d899c9 (diff) | |
| parent | 14d6bb655e057567e28c2532731b3dda37ef834f (diff) | |
| download | mariadb-git-c7601db62e128677c0e4a7f752ec0073ead85ce6.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-tmp
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index dd6bdf45e82..771b1ab11d6 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -170,7 +170,6 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, else #endif { - read_file_from_client=0; #ifdef DONT_ALLOW_FULL_LOAD_DATA_PATHS ex->file_name+=dirname_length(ex->file_name); #endif @@ -325,7 +324,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, which is nonsense. */ read_info.end_io_cache(); - Delete_file_log_event d(thd, log_delayed); + Delete_file_log_event d(thd, db, log_delayed); mysql_bin_log.write(&d); } } @@ -359,7 +358,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, read_info.end_io_cache(); // make sure last block gets logged if (lf_info.wrote_create_file) { - Execute_load_log_event e(thd, log_delayed); + Execute_load_log_event e(thd, db, log_delayed); mysql_bin_log.write(&e); } } @@ -822,9 +821,13 @@ int READ_INFO::read_field() row_end= to; return 0; } - /* Copy the found '"' character */ + /* + The string didn't terminate yet. + Store back next character for the loop + */ PUSH(chr); - chr='"'; + /* copy the found term character to 'to' */ + chr= found_enclosed_char; } else if (chr == field_term_char && found_enclosed_char == INT_MAX) { |