Commit c41c29a6 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/space/my/mysql-4.1
parents cc78467d 755d2018

sql/ha_innodb.cc

+2 −1
Original line number Diff line number Diff line
@@ -5420,7 +5420,8 @@ ha_innobase::store_lock( 


    		if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&

	 	    lock_type <= TL_WRITE) && !thd->in_lock_tables

		    && !thd->tablespace_op) {

		    && !thd->tablespace_op

                    && thd->lex->sql_command != SQLCOM_CREATE_TABLE) {



      			lock_type = TL_WRITE_ALLOW_WRITE;

      		}

sql/hash_filo.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#ifndef  HASH_FILO_H

#define  HASH_FILO_H



#ifdef __GNUC__

#ifdef USE_PRAGMA_INTERFACE

#pragma interface			/* gcc class interface */

#endif