Merge lp:~dshrews/drizzle/bug656474 into lp:~drizzle-trunk/drizzle/development

[David Shrewsbury]

Fix for transaction_reader utility. ROLLBACK statements were not being printed.

=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2010-10-05 21:14:30 +0000
+++ drizzled/message/statement_transform.cc	2010-10-07 20:31:00 +0000
@@ -127,6 +127,11 @@
 
   switch (source.type())
   {
+  case Statement::ROLLBACK:
+    {
+      sql_strings.push_back("ROLLBACK");
+      break;
+    }
   case Statement::INSERT:
     {
       if (! source.has_insert_header())

=== modified file 'drizzled/message/transaction_reader.cc'
--- drizzled/message/transaction_reader.cc	2010-09-21 19:25:33 +0000
+++ drizzled/message/transaction_reader.cc	2010-10-07 20:31:00 +0000
@@ -174,6 +174,15 @@
     if (should_commit)
       should_commit= isEndStatement(statement);
 
+    /* A ROLLBACK would be the only Statement within the Transaction
+     * since all other Statements will have been deleted from the
+     * Transaction message, so we should fall out of this loop immediately.
+     * We don't want to issue an unnecessary COMMIT, so we change
+     * should_commit to false here.
+     */
+    if (statement.type() == message::Statement::ROLLBACK)
+      should_commit= false;
+
     printStatement(statement);
   }