diff options
| author | unknown <joerg@debian.(none)> | 2007-07-26 16:21:01 +0200 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-07-26 16:21:01 +0200 |
| commit | 41f2133f950133488879a82aa19b728a8fb35a3f (patch) | |
| tree | 6f900f7d2c1f9248ddfdfdf7c681acc3823aae1f /storage | |
| parent | ba559de4bed282d0f5adc31366001774e950a561 (diff) | |
| parent | 5cb265d8747314a350d343813edec9c1b94dff75 (diff) | |
| download | mariadb-git-41f2133f950133488879a82aa19b728a8fb35a3f.tar.gz | |
Merge debian.(none):/M51/mysql-5.1
into debian.(none):/M51/push-5.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b7d0c4417c3..840a0ec7e3b 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -7042,18 +7042,6 @@ ha_innobase::store_lock( && !thd_tablespace_op(thd) && sql_command != SQLCOM_TRUNCATE && sql_command != SQLCOM_OPTIMIZE - -#ifdef __WIN__ - /* For alter table on win32 for successful - operation completion it is used TL_WRITE(=10) lock - instead of TL_WRITE_ALLOW_READ(=6), however here - in innodb handler TL_WRITE is lifted to - TL_WRITE_ALLOW_WRITE, which causes race condition - when several clients do alter table simultaneously - (bug #17264). This fix avoids the problem. */ - && sql_command != SQLCOM_ALTER_TABLE -#endif - && sql_command != SQLCOM_CREATE_TABLE) { lock_type = TL_WRITE_ALLOW_WRITE; |