Merge lp:~skinny.moey/drizzle/transaction_log_674588 into lp:drizzle/7.0

[Joe Daly]

This fixes part of 674588. Duplicate trx ids were being assigned for enable/disable of keys, this change adds a specific call to allocate a new trx for this call.

It also reworks doGetNewTransactionId() there needs to be a call to innobase_trx_init() this will allow a call to session_to_trx() to not return null at a later time. This also will allow cleanup to happen properly in the ~Session destructor.

There are still duplicate trx ids showing up for update/delete/insert I will file a new bug for that.

=== modified file 'drizzled/statement/alter_table.cc'
--- drizzled/statement/alter_table.cc	2010-11-15 05:43:10 +0000
+++ drizzled/statement/alter_table.cc	2010-11-17 03:54:58 +0000
@@ -1035,6 +1035,8 @@
 
       if (error == 0)
       {
+        TransactionServices &transaction_services= TransactionServices::singleton();
+        transaction_services.allocateNewTransactionId();
         write_bin_log(session, *session->getQueryString());
         session->my_ok();
       }

=== modified file 'drizzled/transaction_services.cc'
--- drizzled/transaction_services.cc	2010-11-08 20:00:45 +0000
+++ drizzled/transaction_services.cc	2010-11-17 03:54:58 +0000
@@ -1038,6 +1038,7 @@
   delete in_transaction;
   in_session->setStatementMessage(NULL);
   in_session->setTransactionMessage(NULL);
+  in_session->setXaId(0);
 }
 
 int TransactionServices::commitTransactionMessage(Session *in_session)
@@ -2162,7 +2163,7 @@
   ReplicationServices &replication_services= ReplicationServices::singleton();
   if (! replication_services.isActive())
     return;
-  
+ 
   message::Transaction *transaction= getActiveTransactionMessage(in_session);
   message::Statement *statement= transaction->add_statement();
 

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2010-11-15 05:43:10 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2010-11-17 03:54:58 +0000
@@ -8865,7 +8865,14 @@
 
 uint64_t InnobaseEngine::doGetNewTransactionId(Session *session)
 {
-  trx_t *trx= innobase_trx_allocate(session);
+  trx_t*& trx = session_to_trx(session);
+
+  if (trx == NULL)
+  {
+    trx = innobase_trx_allocate(session);
+
+    innobase_trx_init(session, trx);
+  }
 
   mutex_enter(&kernel_mutex);
   trx->id= trx_sys_get_new_trx_id();
@@ -8873,8 +8880,6 @@
 
   uint64_t transaction_id= (ib_uint64_t) ut_conv_dulint_to_longlong(trx->id);
 
-  trx_free_for_mysql(trx);
-
   return transaction_id;
 }