Skip to content

M
mariadb
Commit 25273706 authored by lenz@mysql.com's avatar lenz@mysql.com
Browse files
Options

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

into mysql.com:/space/my/mysql-4.1
parents 53e49d05 f9e9406b
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sql/ha_innodb.cc
View file @ 25273706
...@@ -5420,7 +5420,8 @@ ha_innobase::store_lock( ...@@ -5420,7 +5420,8 @@ ha_innobase::store_lock(
if ((lock_type >= TL_WRITE_CONCURRENT_INSERT && if ((lock_type >= TL_WRITE_CONCURRENT_INSERT &&
lock_type <= TL_WRITE) && !thd->in_lock_tables 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; lock_type = TL_WRITE_ALLOW_WRITE;
} }
......
sql/hash_filo.h
View file @ 25273706
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#ifndef HASH_FILO_H #ifndef HASH_FILO_H
#define HASH_FILO_H #define HASH_FILO_H
#ifdef __GNUC__ #ifdef USE_PRAGMA_INTERFACE
#pragma interface /* gcc class interface */ #pragma interface /* gcc class interface */
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7