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

into mysql.com:/space/my/mysql-4.1

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
25273706 · lenz@mysql.com · 53e49d05 · f9e9406b · 25273706 · 25273706
Commit 25273706 authored May 27, 2005 by lenz@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/ha_innodb.cc sql/ha_innodb.cc +2 -1

sql/hash_filo.h sql/hash_filo.h +1 -1

No files found.
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -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;
      		}

--- a/sql/hash_filo.h
+++ b/sql/hash_filo.h
@@ -23,7 +23,7 @@
 #ifndef  HASH_FILO_H
 #define  HASH_FILO_H

-#ifdef __GNUC__
+#ifdef USE_PRAGMA_INTERFACE
 #pragma interface			/* gcc class interface */
 #endif