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

manual merge

Browse Source
This commit is contained in:
serg@serg.mylan
2004-07-20 15:34:57 +02:00
parent 14853c80d6 27f9f14e1d
commit 8d080cbcfa
48 changed files with 416 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_load.cc
View File

@ -320,6 +320,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
{
if (transactional_table)
ha_autocommit_or_rollback(thd,error);
if (read_file_from_client)
while (!read_info.next_line())
;
#ifndef EMBEDDED_LIBRARY
if (mysql_bin_log.is_open())
{