1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reverting yesterday's patch. (cmiller:1.2099)

Browse Source
This commit is contained in:
cmiller@zippy.(none) 2006-03-29 10:56:11 -05:00
parent 0d332aef39
commit c07a84f75f
3 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mysql-test/r/loaddata.result
View File

@ -139,18 +139,3 @@ a b c
10 NULL Ten 10 NULL Ten
15 NULL Fifteen 15 NULL Fifteen
drop table t1, t2; drop table t1, t2;
create table bug11151 (a int, b int) engine=InnoDB;
start transaction;
insert into bug11151 values (0, 0);
rollback;
select a, b from bug11151;
a b
delete from bug11151;
start transaction;
insert into bug11151 values (42, 0);
load data infile '../std_data_ln/loaddata5.dat' into table bug11151 fields terminated by '' enclosed by '' (a, b);
insert into bug11151 values (42, 99);
rollback;
select a, b from bug11151;
a b
drop table bug11151;

22
mysql-test/t/loaddata.test
View File

@ -113,26 +113,4 @@ select * from t1;
# cleanup # cleanup
drop table t1, t2; drop table t1, t2;
#
# Bug#11151: LOAD DATA INFILE commits transaction in 5.0
#
create table bug11151 (a int, b int) engine=InnoDB;
start transaction;
insert into bug11151 values (0, 0);
rollback;
select a, b from bug11151;
delete from bug11151;
start transaction;
insert into bug11151 values (42, 0);
load data infile '../std_data_ln/loaddata5.dat' into table bug11151 fields terminated by '' enclosed by '' (a, b);
insert into bug11151 values (42, 99);
rollback;
select a, b from bug11151;
drop table bug11151;
# End of 5.0 tests # End of 5.0 tests

7
sql/sql_load.cc
View File

@ -381,7 +381,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->next_number_field=0; table->next_number_field=0;
} }
ha_enable_transaction(thd, TRUE);
if (file >= 0) if (file >= 0)
my_close(file,MYF(0)); my_close(file,MYF(0));
free_blobs(table); /* if pack_blob was used */ free_blobs(table); /* if pack_blob was used */
@ -396,6 +396,9 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
if (error) if (error)
{ {
if (transactional_table)
ha_autocommit_or_rollback(thd,error);
if (read_file_from_client) if (read_file_from_client)
while (!read_info.next_line()) while (!read_info.next_line())
; ;
@ -462,6 +465,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
ignore, transactional_table); ignore, transactional_table);
} }
#endif /*!EMBEDDED_LIBRARY*/ #endif /*!EMBEDDED_LIBRARY*/
if (transactional_table)
error=ha_autocommit_or_rollback(thd,error);
err: err:
if (thd->lock) if (thd->lock)