database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge with 4.0.15

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-08-29 13:44:35 +03:00
parent 6cad89775b 5e04e2370f
commit 77a70a0a24
194 changed files with 3891 additions and 3197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_load.cc
View File

@ -171,7 +171,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
@ -311,7 +310,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);
}
}
@ -343,7 +342,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);
}
}
@ -806,9 +805,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)
{