diff options
| author | unknown <gshchepa/uchum@gleb.loc> | 2007-07-26 01:23:39 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@gleb.loc> | 2007-07-26 01:23:39 +0500 |
| commit | 21b83ab756964c53809762d8a58b2a092b567ef3 (patch) | |
| tree | de7f58c009ad9c9bd3423692826de8ea954f9763 /sql/sql_base.cc | |
| parent | 54c9742922864ee711e024bb93307c553d66fb38 (diff) | |
| parent | 0784d92414cba073201000ed0df23d136a6df077 (diff) | |
| download | mariadb-git-21b83ab756964c53809762d8a58b2a092b567ef3.tar.gz | |
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
into gleb.loc:/home/uchum/work/bk/5.1-opt
mysql-test/r/having.result:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/having.test:
Auto merged
sql/field.cc:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/include/mix1.inc:
Merge with 5.0-opt.
mysql-test/r/create.result:
Merge with 5.0-opt.
mysql-test/r/innodb_mysql.result:
Merge with 5.0-opt.
mysql-test/r/type_enum.result:
Merge with 5.0-opt.
mysql-test/t/type_enum.test:
Merge with 5.0-opt.
sql/filesort.cc:
Merge with 5.0-opt.
sql/sql_base.cc:
Merge with 5.0-opt.
sql/table.cc:
Merge with 5.0-opt.
storage/innobase/handler/ha_innodb.cc:
Merge with 5.0-opt.
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 6fd57c5a428..4773981e877 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3797,13 +3797,6 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type) if (table) { -#if defined( __WIN__) - /* Win32 can't drop a file that is open */ - if (lock_type == TL_WRITE_ALLOW_READ) - { - lock_type= TL_WRITE; - } -#endif /* __WIN__ */ table_list->lock_type= lock_type; table_list->table= table; table->grant= table_list->grant; |