List:Commits« Previous MessageNext Message »
From:Mattias Jonsson Date:February 14 2011 10:40am
Subject:bzr commit into mysql-trunk branch (mattias.jonsson:3642) Bug#60114
View as plain text  
#At file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217_4/ based on revid:mattias.jonsson@stripped

 3642 Mattias Jonsson	2011-02-14
      Disabled newly added DBUG_ASSERT because of bug#60114.
     @ sql/handler.cc
        Disabled newly added DBUG_ASSERT because of bug#60114.

    modified:
      sql/handler.cc
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2011-02-14 10:28:11 +0000
+++ b/sql/handler.cc	2011-02-14 10:40:42 +0000
@@ -2835,8 +2835,10 @@ void handler::get_auto_increment(ulonglo
 
 void handler::ha_release_auto_increment()
 {
+#ifdef BUG60114_IS_FIXED
   DBUG_ASSERT(table_share->tmp_table != NO_TMP_TABLE ||
               m_lock_type != F_UNLCK);
+#endif
   release_auto_increment();
   insert_id_for_cur_row= 0;
   auto_inc_interval_for_cur_row.replace(0, 0, 0);


Attachment: [text/bzr-bundle] bzr/mattias.jonsson@oracle.com-20110214104042-8usdqv9k5qqwogcq.bundle
Thread
bzr commit into mysql-trunk branch (mattias.jonsson:3642) Bug#60114Mattias Jonsson14 Feb