diff options
author | unknown <monty@narttu.mysql.fi> | 2003-03-04 12:22:35 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2003-03-04 12:22:35 +0200 |
commit | 3446199d8e421da02a5546f439ee76b368594700 (patch) | |
tree | 6c1fb5d875ec9be01b82dead74784385452e9aa2 /sql/mysql_priv.h | |
parent | 4c0f2f45913ad0a60211785792afc45037cfd608 (diff) | |
download | mariadb-git-3446199d8e421da02a5546f439ee76b368594700.tar.gz |
Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped
client/mysqltest.c:
Fixed bug that comments did a ping
include/thr_lock.h:
Added function to abort a lock for a specific thread
mysql-test/mysql-test-run.sh:
Fixed where mysqltest traces are put
mysql-test/r/lock_multi.result:
Test for LOCK TABLE + DROP TABLE bug
mysql-test/t/lock_multi.test:
Test for LOCK TABLE + DROP TABLE bug
mysys/thr_lock.c:
Added function to abort a lock for a specific thread
sql/handler.cc:
Indentation cleanup
sql/lock.cc:
Added function to abort a lock for a specific thread
sql/mysql_priv.h:
Added function to abort a lock for a specific thread
sql/mysqld.cc:
Use automatic recover even with --safe
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 83b41359192..7d830859fb2 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -711,6 +711,7 @@ void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count); void mysql_lock_remove(THD *thd, MYSQL_LOCK *locked,TABLE *table); void mysql_lock_abort(THD *thd, TABLE *table); +void mysql_lock_abort_for_thread(THD *thd, TABLE *table); MYSQL_LOCK *mysql_lock_merge(MYSQL_LOCK *a,MYSQL_LOCK *b); bool lock_global_read_lock(THD *thd); void unlock_global_read_lock(THD *thd); |