From: Mattias Jonsson
Date: April 19 2012 7:16am
Subject: bzr push into mysql-trunk branch (mattias.jonsson:3883 to 3884) Bug#11940249
List-Archive: http://lists.mysql.com/commits/143517
X-Bug: 11940249
Message-Id: <201204190716.q3J7G96T031655@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3884 Mattias Jonsson	2012-04-19
      Bug#11940249: post push fix, removed incorrect DBUG_ASSERT.

    modified:
      storage/myisam/ha_myisam.cc
 3883 Jimmy Yang	2012-04-19
      Fix Bug #13881758 - 64745: INNODB INTERNAL SQL DOES NOT HANDLE EMPTY
      SPACE IN DATABASE/TABLENAME
            
      rb://1029 approved by Sunny Bains

    modified:
      mysql-test/suite/innodb_fts/r/innodb_fts_misc.result
      mysql-test/suite/innodb_fts/t/innodb_fts_misc.test
      storage/innobase/pars/lexyy.cc
      storage/innobase/pars/pars0lex.l
=== modified file 'storage/myisam/ha_myisam.cc'
--- a/storage/myisam/ha_myisam.cc	revid:jimmy.yang@stripped
+++ b/storage/myisam/ha_myisam.cc	revid:mattias.jonsson@stripped
@@ -1035,7 +1035,6 @@ int ha_myisam::repair(THD *thd, MI_CHECK
   MYISAM_SHARE* share = file->s;
   ha_rows rows= file->state->records;
   DBUG_ENTER("ha_myisam::repair");
-  DBUG_ASSERT(file->lock_type != F_RDLCK);
 
   param.db_name=    table->s->db.str;
   param.table_name= table->alias;

No bundle (reason: useless for push emails).