diff options
| author | unknown <monty@mysql.com> | 2004-10-20 16:04:28 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-10-20 16:04:28 +0300 |
| commit | ec8779e95a46b3dfff492196ad004cb2716df3c3 (patch) | |
| tree | 23e87e07794af4dd31668c4f6f75475638445d9c /sql/sql_base.cc | |
| parent | 95f0e39a38435e0451e77c919ce21697eaccd334 (diff) | |
| download | mariadb-git-ec8779e95a46b3dfff492196ad004cb2716df3c3.tar.gz | |
Fix test case for innodb-lock
mysql-test/r/innodb-lock.result:
Fix test case (old one didn't test things correctly)
mysql-test/t/innodb-lock.test:
Fix test case (old one didn't test things correctly)
mysys/thr_lock.c:
More debugging information
sql/mysqld.cc:
Enable innodb_table_locks as default, as otherwise there is a possibility for deadlocks
sql/sql_base.cc:
More debug information
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9810ec6c3d6..72400bf0abb 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -826,6 +826,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, DBUG_RETURN(0); } table->query_id=thd->query_id; + DBUG_PRINT("info",("Using temporary table")); goto reset; } } @@ -840,6 +841,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name, table->query_id != thd->query_id) { table->query_id=thd->query_id; + DBUG_PRINT("info",("Using locked table")); goto reset; } } |