Merge lp:~stewart/drizzle/bug701468-rollback-all-not-true into lp:drizzle/7.0

[Stewart Smith]

rollbackTransaction's all parameter was also a lie.

https://code.launchpad.net/~stewart/drizzle/seapitester-state-history/+merge/46092 is a merge req for an improvement to storage_engine_api_tester that means we can reasonably test this a bit easier than "hey, the test suite still passes"

[Patrick Crews (patrick-crews)]

Running the test suite and checking lcov numbers shows that the affected lines of code are exercised by the test suite. Did not check changes to pbxt or haildb code as this is supposed to be a cursory check.

Test cases appear satisfactory.

=== modified file 'drizzled/transaction_services.cc'
--- drizzled/transaction_services.cc	2011-01-17 01:31:33 +0000
+++ drizzled/transaction_services.cc	2011-01-17 01:31:34 +0000
@@ -642,6 +642,7 @@
   TransactionContext::ResourceContexts &resource_contexts= trans->getResourceContexts();
 
   bool is_real_trans= normal_transaction || session->transaction.all.getResourceContexts().empty();
+  bool all = normal_transaction || !session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
 
   /*
     We must not rollback the normal transaction if a statement
@@ -663,7 +664,7 @@
 
       if (resource->participatesInXaTransaction())
       {
-        if ((err= resource_context->getXaResourceManager()->xaRollback(session, normal_transaction)))
+        if ((err= resource_context->getXaResourceManager()->xaRollback(session, all)))
         {
           my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
           error= 1;
@@ -675,7 +676,7 @@
       }
       else if (resource->participatesInSqlTransaction())
       {
-        if ((err= resource_context->getTransactionalStorageEngine()->rollback(session, normal_transaction)))
+        if ((err= resource_context->getTransactionalStorageEngine()->rollback(session, all)))
         {
           my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
           error= 1;
@@ -695,7 +696,7 @@
      * a rollback statement with the corresponding transaction ID
      * to rollback.
      */
-    if (normal_transaction)
+    if (all)
       rollbackTransactionMessage(session);
     else
       rollbackStatementMessage(session);

=== modified file 'plugin/haildb/haildb_engine.cc'
--- plugin/haildb/haildb_engine.cc	2011-01-17 01:31:33 +0000
+++ plugin/haildb/haildb_engine.cc	2011-01-17 01:31:34 +0000
@@ -427,7 +427,7 @@
   ib_err_t err;
   ib_trx_t *transaction= get_trx(session);
 
-  if (all || !session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
+  if (all)
   {
     err= ib_trx_rollback(*transaction);
 

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2011-01-17 01:31:33 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2011-01-17 01:31:34 +0000
@@ -2695,9 +2695,8 @@
 
   row_unlock_table_autoinc_for_mysql(trx);
 
-  if (all
-    || !session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN)) {
-
+  if (all)
+  {
     error = trx_rollback_for_mysql(trx);
   } else {
     error = trx_rollback_last_sql_stat_for_mysql(trx);

=== modified file 'plugin/pbxt/src/ha_pbxt.cc'
--- plugin/pbxt/src/ha_pbxt.cc	2011-01-17 01:31:33 +0000
+++ plugin/pbxt/src/ha_pbxt.cc	2011-01-17 01:31:34 +0000
@@ -5738,13 +5738,11 @@
 	return err;
 }
 
-int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool)
+int PBXTStorageEngine::doRollback(drizzled::Session* thd, bool real_commit)
 {
         int err = 0;
         XTThreadPtr self = (XTThreadPtr) *thd->getEngineData(pbxt_hton);
 
-        bool real_commit = !session_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN);
-
 	XT_PRINT1(self, "PBXTStorageEngine::doRollback(real_commit = %s)\n", real_commit ? "true" : "false");
 
         if (real_commit && self) {

=== modified file 'plugin/storage_engine_api_tester/storage_engine_api_tester.cc'
--- plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2011-01-17 01:31:33 +0000
+++ plugin/storage_engine_api_tester/storage_engine_api_tester.cc	2011-01-17 01:31:34 +0000
@@ -505,8 +505,7 @@
 
 int SEAPITester::doRollback(Session *session, bool all)
 {
-  if (all
-    || !session_test_options(session, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))
+  if (all)
   {
     ENGINE_NEW_STATE("ROLLBACK");
     ENGINE_NEW_STATE("::SEAPITester()");

=== added file 'tests/suite/regression/r/701468.result'
--- tests/suite/regression/r/701468.result	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/r/701468.result	2011-01-17 01:31:34 +0000
@@ -0,0 +1,14 @@
+create table t1 (a int not null);
+insert into t1 values (1), (NULL), (2);
+ERROR 23000: Column 'a' cannot be null
+begin;
+insert into t1 values (42);
+insert into t1 values (1), (NULL), (2);
+ERROR 23000: Column 'a' cannot be null
+select * from t1;
+a
+42
+rollback;
+select * from t1;
+a
+drop table t1;

=== added file 'tests/suite/regression/t/701468.test'
--- tests/suite/regression/t/701468.test	1970-01-01 00:00:00 +0000
+++ tests/suite/regression/t/701468.test	2011-01-17 01:31:34 +0000
@@ -0,0 +1,14 @@
+create table t1 (a int not null);
+--error 1048
+insert into t1 values (1), (NULL), (2);
+
+begin;
+insert into t1 values (42);
+--error 1048
+insert into t1 values (1), (NULL), (2);
+select * from t1;
+rollback;
+select * from t1;
+
+drop table t1;
+