diff options
| author | unknown <serg@serg.mylan> | 2004-06-24 19:46:50 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-06-24 19:46:50 +0200 |
| commit | 7e15532dadc2c8c5dad650ac7e6a91056e86e172 (patch) | |
| tree | 99d5fd1b33e2fdbeb208cef9dae2aa9acf28c5ce /sql/opt_range.cc | |
| parent | f3b3e072014f9e995fa73909f7a505ff4a21792c (diff) | |
| download | mariadb-git-7e15532dadc2c8c5dad650ac7e6a91056e86e172.tar.gz | |
bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before
sql/ha_myisam.h:
cleanup
mysql-test/r/bdb.result:
bug#4089
mysql-test/t/bdb.test:
bug#4089
sql/opt_range.cc:
be sloppy
sql/sql_select.cc:
JOIN::join_free - pass it down the tree (of selects)
call mysql_unlock_tables only in top-level select
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 3a1d441caac..804bb0a413c 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -413,7 +413,8 @@ QUICK_SELECT::~QUICK_SELECT() { if (!dont_free) { - file->ha_index_end(); + if (file->inited) + file->ha_index_end(); free_root(&alloc,MYF(0)); } } |