From: Jon Olav Hauglid
Date: October 14 2010 9:02am
Subject: bzr commit into mysql-5.5-runtime branch (jon.hauglid:3165) Bug#55930
List-Archive: http://lists.mysql.com/commits/120755
X-Bug: 55930
Message-Id: <201010140904.o9E7c0fM029892@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0811832414477820337=="

--===============0811832414477820337==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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);


--===============0811832414477820337==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jon.hauglid@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-rqg5/
# testament_sha1: 8a1095cad00f8e275b9b1e4d6340bc12bdfe72c7
# timestamp: 2010-10-14 11:02:40 +0200
# source_branch: file:///export/home/x/mysql-5.5-bugfixing/
# base_revision_id: jon.hauglid@stripped\
#   956wns2l1r776wma
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXlYR1oAAap/gFAQAgB44///
d1CEAP////RQA/7t27pWLbsO4GwlEgm1NpqnkwITynqnjQiM1PUeoZNMh6gaRMppmp6EbUBoaZGg
NAABoAMRExEZT0001E2mmp6hskyeoGg000HqDmAAmTAAmEwTCGAIwAJKCKep+Q0mp6ZRsp6mmhoN
QbSADBPUeU3Zamfj+7mXY4XGBBr5UsAZP88Xu4mNdIQ1b98eGG+SSHj9BohJ926A3Rg/gvz+6xas
f1fUn86VeXKM4t56ZVpNFSluBAWTRPwZxskuurjm8kYqGuha6mRKrsVklPcQsIgEAOt3AVCo1tsF
HzYJlOBTFNAiWRBJoTLQiVII0p6Dq+PsJGYVEkStBYSt05QkGw1g0CMShFnyBtIrmBVsBXzDMWNe
+L7XBYwWSiH2JjrhcWAy251FYkHCzc/mSWk75a2HYEYlqzq/OINGNyVwixklROZBKBZU4JsyRtBp
KemOMhsAwjWqBSxxfVPlpYe4vYhSIyoaGd+kTgz4inkvUxJHINHErzgJ0hubrsIrsbHBpS3WFnTU
1C8rYV1eEENNuYtIYZLmT53vTWPImWkIAw1ibI1W17LPlgmlWikGHQDrbVoOesiD2BGAGiNmQgYY
Ckq65xKBg4eq/pAykHkJjSM0c3M18mWNdqqBqYSk5UlEQAqku7iMZ79O3Et2fXu1ARJFKq0kl5O7
9rpPkeGbPIhnHfAencoinQgqgOkcpOYDTl72xYbpzYkVkrwa5HXZx8HhLXbSilRqErUX3kRCuc2e
Gs7x9WURkNOqYZuQzuC9HYOdVvzjDxNt3dCnVsmEgDMkXa3GeODCeRG/Rhtj20tMSmBOgU6jIwmF
6B/RVEhoz4ISQAS8IvnDIp5FPtKMd1wB5qeaKBbdW+ehZOHbO6lY+jCEy7aF0LXoVeiKmVzX6pFw
aSBeZkghwW400RG58PfgSD/W97aGIZHCeE57TFBsYJNvE30FwTcUQuE7OHWUckSadZo4+WxGIgyP
zfeVJCkBuOATOd9r6Ymlaqi77Mg2xUpIHM+grJeRtL0cLn0hjsMRZBsDM0BoeE6/zibbt7a0hx4A
qomruXH0x2lrYkhwNpsrvHQ4uGPqpvnIKlNoEK5BQZIk5BBnF02AhBjztprjcBIxA0IzRRtumLL2
H91AHlMcl4khAcVKgVh/pI1EMdbHDNbfzazZzpFxSZ2O+M3lJuF1ZE6zTUfeA5Jbq5jHPFiM3XaJ
9cpG3ZnsnIPsoJsjlQjwBajm+VxudUVkwFM+7UOHBT3swzclxwhYe+0CAcN0C/lhrgEGCaBL4i/E
CDxYabBVxbk3+fxl6MZpxmGwnQIk62ywZlTD7mPiJLnT4es4JyLTRxf3NaUuhYtYQoLTcYATEhMV
UmDiBn+RNoLyj3I8P+LuSKcKEg8rCOtA


--===============0811832414477820337==--