diff options
| author | unknown <serg@serg.mylan> | 2005-05-27 12:48:36 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-27 12:48:36 +0200 |
| commit | 8dcb03f7a25bda9eefe1c8b0004889166e7e258f (patch) | |
| tree | cfaaed12a39945e356dc515291d8e54f8515afeb /sql | |
| parent | 5f767b11e4de23d6843eebb886ddbcf185572747 (diff) | |
| parent | 360d1cd06d6ea1a803305a5fcfde5a79c16365b7 (diff) | |
| download | mariadb-git-8dcb03f7a25bda9eefe1c8b0004889166e7e258f.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index bb3c359ccdb..3f2e11e8bd1 100644 --- 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; } |