summaryrefslogtreecommitdiff
path: root/mysql-test/include/loaddata_autocom.inc
diff options
context:
space:
mode:
authorguilhem@gbichot3.local <>2006-09-05 16:52:05 +0200
committerguilhem@gbichot3.local <>2006-09-05 16:52:05 +0200
commite4d3595b18eda1d2327050eb95262c92eed5d8bf (patch)
treee3d37dfc52626891f544df507b4fd8fa18d444f0 /mysql-test/include/loaddata_autocom.inc
parent4d0430c8fde8c5c20afee073775210c7f13f7a44 (diff)
downloadmariadb-git-e4d3595b18eda1d2327050eb95262c92eed5d8bf.tar.gz
Fix for BUG#11151 "LOAD DATA INFILE commits transaction in 5.0".
In 5.0 we made LOAD DATA INFILE autocommit in all engines, while only NDB wanted that. Users and trainers complained that it affected InnoDB and was a change compared to 4.1 where only NDB autocommitted. To revert to the behaviour of 4.1, we move the autocommit logic out of mysql_load() into ha_ndbcluster::external_lock(). The result is that LOAD DATA INFILE commits all uncommitted changes of NDB if this is an NDB table, its own changes if this is an NDB table, but does not affect other engines. Note: even though there is no "commit the full transaction at end" anymore, LOAD DATA INFILE stays disabled in routines (re-entrency problems per a comment of Pem). Note: ha_ndbcluster::has_transactions() does not give reliable results because it says "yes" even if transactions are disabled in this engine...
Diffstat (limited to 'mysql-test/include/loaddata_autocom.inc')
-rw-r--r--mysql-test/include/loaddata_autocom.inc21
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/include/loaddata_autocom.inc b/mysql-test/include/loaddata_autocom.inc
new file mode 100644
index 00000000000..e5071c73c49
--- /dev/null
+++ b/mysql-test/include/loaddata_autocom.inc
@@ -0,0 +1,21 @@
+# Test if the engine does autocommit in LOAD DATA INFILE, or not
+# (NDB wants to do, others don't).
+
+eval SET SESSION STORAGE_ENGINE = $engine_type;
+
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
+create table t1 (a text, b text);
+start transaction;
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+commit;
+select count(*) from t1;
+truncate table t1;
+start transaction;
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+rollback;
+select count(*) from t1;
+
+drop table t1;