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

Merge bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
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
This commit is contained in:
unknown
2003-09-07 15:14:32 +03:00
parent 08e2747587 84b296e242
commit c9d1bdfac3
194 changed files with 3950 additions and 3232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_load.cc
View File

@ -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)
{