diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-09 23:02:36 +0300 |
| commit | 0fece375f2ae4bb173357609b46924a997113593 (patch) | |
| tree | 288f7cc7d0ca91ae340b7a568971bb02d8eb798d /sql/lock.cc | |
| parent | 2321260ff07b0a90e3f84c756370a328ac17f990 (diff) | |
| download | mariadb-git-0fece375f2ae4bb173357609b46924a997113593.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
Docs/manual.texi:
Changelog + update of table types
bdb/include/log.h:
Patch from Sleepycat
bdb/log/log.c:
Patch from Sleepycat
bdb/log/log_rec.c:
Patch from Sleepycat
client/mysqladmin.c:
Cleanup
innobase/include/univ.i:
Fix for compilation on Windows
innobase/os/os0file.c:
cleanup
innobase/pars/pars0grm.y:
Fix for compilation on Windows
mysql-test/r/innodb.result:
New test case
mysql-test/t/innodb.test:
New test case
sql/ha_innobase.cc:
cleanup
sql/ha_innobase.h:
Fix for prefix keys
sql/handler.h:
Fix for temporary Innodb tables
sql/item_strfunc.cc:
Fixed bug in REPLACE()
sql/lock.cc:
Fix for temporary Innodb tables
sql/mysqld.cc:
Added --skip-stack-trace
sql/share/english/errmsg.txt:
Better error messages
sql/sql_base.cc:
Fix for temporary Innodb tables
sql/sql_select.cc:
Fix for temporary Innodb tables
sql/sql_table.cc:
Fixed sub char keys for InnoDB
sql/table.h:
Fix for temporary Innodb tables
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; |