bzr commit into mysql-5.5-runtime branch (jon.hauglid:3165) Bug#55930

[Jon Olav Hauglid]

#At file:///export/home/x/mysql-5.5-runtime-rqg5/ based on revid:jon.hauglid@stripped

 3165 Jon Olav Hauglid	2010-10-14
      Follow-up for Bug #55930 Assertion `thd->transaction.stmt.is_empty()
                               || thd->in_sub_stmt || (thd->state..
      
      Don't rollback statement transactions if we are in a sub-statement.
      This could for example happen for open_ltable() when opening the
      general log during execution of a stored procedure.

    modified:
      sql/sql_base.cc
=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-10-13 14:15:28 +0000
+++ b/sql/sql_base.cc	2010-10-14 09:02:37 +0000
@@ -5320,7 +5320,8 @@ TABLE *open_ltable(THD *thd, TABLE_LIST
 end:
   if (table == NULL)
   {
-    trans_rollback_stmt(thd);
+    if (!thd->in_sub_stmt)
+      trans_rollback_stmt(thd);
     close_thread_tables(thd);
   }
   thd_proc_info(thd, 0);


Attachment: [text/bzr-bundle] bzr/[e-mail]