Commit 3fe4e30c authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

parents c7a681ff a2580e91
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3106,7 +3106,7 @@ THR_LOCK_DATA **ha_ndbcluster::store_lock(THD *thd,
    /* Since NDB does not currently have table locks
       this is treated as a ordinary lock */

    if ((lock_type >= TL_WRITE_ALLOW_WRITE &&
    if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
         lock_type <= TL_WRITE) && !thd->in_lock_tables)      
      lock_type= TL_WRITE_ALLOW_WRITE;