diff options
| author | monty@donna.mysql.fi <> | 2001-05-09 23:02:36 +0300 |
|---|---|---|
| committer | monty@donna.mysql.fi <> | 2001-05-09 23:02:36 +0300 |
| commit | 965cd30f8779bc28a3c7181c64f8880b04b334d7 (patch) | |
| tree | 288f7cc7d0ca91ae340b7a568971bb02d8eb798d /sql/lock.cc | |
| parent | 33fa6e04cc0ec389d07cf0aa59db59c8d67c41eb (diff) | |
| download | mariadb-git-965cd30f8779bc28a3c7181c64f8880b04b334d7.tar.gz | |
Applied patches for BDB tables
Fixes to InnoDB to compile on Windows
Fix for temporary InnoDB tables
Fixed bug in REPLACE()
Fixed sub char keys for InnoDB
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index 915f1831245..23f81c9c164 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -346,7 +346,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, *write_lock_used=0; for (i=tables=lock_count=0 ; i < count ; i++) { - if (!table_ptr[i]->tmp_table) + if (table_ptr[i]->tmp_table != TMP_TABLE) { tables+=table_ptr[i]->file->lock_count(); lock_count++; @@ -366,7 +366,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, for (i=0 ; i < count ; i++) { TABLE *table; - if ((table=table_ptr[i])->tmp_table) + if ((table=table_ptr[i])->tmp_table == TMP_TABLE) continue; *to++=table; enum thr_lock_type lock_type= table->reginfo.lock_type; |