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 | ff736789672632d415d7d75d8b0a2e85b7b7eae4 (patch) | |
| tree | 99d5fd1b33e2fdbeb208cef9dae2aa9acf28c5ce /sql/ha_myisam.h | |
| parent | c6840712f55f9df9951474b0688e221f0f7c7403 (diff) | |
| download | mariadb-git-ff736789672632d415d7d75d8b0a2e85b7b7eae4.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/ha_myisam.h')
| -rw-r--r-- | sql/ha_myisam.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisam.h b/sql/ha_myisam.h index 9069b41364d..f4c45e6524b 100644 --- a/sql/ha_myisam.h +++ b/sql/ha_myisam.h @@ -81,7 +81,7 @@ class ha_myisam: public handler int index_first(byte * buf); int index_last(byte * buf); int index_next_same(byte *buf, const byte *key, uint keylen); - int index_end() { ft_handler=NULL; return handler::index_end(); } + int index_end() { ft_handler=NULL; return 0; } int ft_init() { if (!ft_handler) |