diff options
| author | unknown <schwenke@alpha.xl.local> | 2005-07-31 19:59:20 +0200 |
|---|---|---|
| committer | unknown <schwenke@alpha.xl.local> | 2005-07-31 19:59:20 +0200 |
| commit | 2fa55b0ad1e4d74720f68c5ff1967ddfcd8808a3 (patch) | |
| tree | 33b94ebd968fb2280e7b9918b9e43bf1faae321e /sql/sql_select.cc | |
| parent | 9cd0ecc84806564d881624404a05b15e4b5cd20d (diff) | |
| parent | b66ffdcbda177da67dd85f3eb8f6114253581897 (diff) | |
| download | mariadb-git-2fa55b0ad1e4d74720f68c5ff1967ddfcd8808a3.tar.gz | |
Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
into alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 74ac9f21a81..de99489d07a 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1849,6 +1849,7 @@ Cursor::fetch(ulong num_rows) JOIN_TAB *join_tab= join->join_tab + join->const_tables; enum_nested_loop_state error= NESTED_LOOP_OK; Query_arena backup_arena; + Engine_info *info; DBUG_ENTER("Cursor::fetch"); DBUG_PRINT("enter",("rows: %lu", num_rows)); @@ -1863,7 +1864,7 @@ Cursor::fetch(ulong num_rows) /* save references to memory, allocated during fetch */ thd->set_n_backup_item_arena(this, &backup_arena); - for (Engine_info *info= ht_info; info->read_view ; info++) + for (info= ht_info; info->read_view ; info++) (info->ht->set_cursor_read_view)(info->read_view); join->fetch_limit+= num_rows; @@ -1882,7 +1883,7 @@ Cursor::fetch(ulong num_rows) /* Grab free_list here to correctly free it in close */ thd->restore_backup_item_arena(this, &backup_arena); - for (Engine_info *info= ht_info; info->read_view; info++) + for (info= ht_info; info->read_view; info++) (info->ht->set_cursor_read_view)(0); if (error == NESTED_LOOP_CURSOR_LIMIT) |