diff options
| author | unknown <tsmith@siva.hindu.god> | 2007-01-18 10:06:36 -0700 |
|---|---|---|
| committer | unknown <tsmith@siva.hindu.god> | 2007-01-18 10:06:36 -0700 |
| commit | e594d61625b09e50a9fa3bb3d7d666de7e6702b1 (patch) | |
| tree | b9862a98b8c3fd2a9f8986b6fe8bf6fd645bd836 /sql/sql_select.cc | |
| parent | 9a765037043f62cc8dd419517b90d520fedc99dd (diff) | |
| parent | 8f1593431fe1ee10fa3d19917b236bdab947276b (diff) | |
| download | mariadb-git-e594d61625b09e50a9fa3bb3d7d666de7e6702b1.tar.gz | |
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
client/mysqlbinlog.cc:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index abb949ae473..d62032c2b44 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -10434,6 +10434,7 @@ evaluate_join_record(JOIN *join, JOIN_TAB *join_tab, */ join->examined_rows++; join->thd->row_count++; + join_tab->read_record.file->unlock_row(); } return NESTED_LOOP_OK; } |