database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

fixed two bugs that break Windows build

Browse Source
This commit is contained in:
schwenke@alpha.xl.local
2005-07-29 15:40:39 +02:00
parent f0f2738c4c
commit 4344cd39e0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/libmysql.def
View File

@ -148,7 +148,6 @@ EXPORTS
mysql_embedded mysql_embedded
mysql_server_init mysql_server_init
mysql_server_end mysql_server_end
get_defaults_files
mysql_set_character_set mysql_set_character_set
mysql_get_character_set_info mysql_get_character_set_info
get_defaults_options get_defaults_options

5
sql/sql_select.cc
View File

@ -1842,6 +1842,7 @@ Cursor::fetch(ulong num_rows)
JOIN_TAB *join_tab= join->join_tab + join->const_tables; JOIN_TAB *join_tab= join->join_tab + join->const_tables;
enum_nested_loop_state error= NESTED_LOOP_OK; enum_nested_loop_state error= NESTED_LOOP_OK;
Query_arena backup_arena; Query_arena backup_arena;
Engine_info *info;
DBUG_ENTER("Cursor::fetch"); DBUG_ENTER("Cursor::fetch");
DBUG_PRINT("enter",("rows: %lu", num_rows)); DBUG_PRINT("enter",("rows: %lu", num_rows));
@ -1856,7 +1857,7 @@ Cursor::fetch(ulong num_rows)
/* save references to memory, allocated during fetch */ /* save references to memory, allocated during fetch */
thd->set_n_backup_item_arena(this, &backup_arena); 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); (info->ht->set_cursor_read_view)(info->read_view);
join->fetch_limit+= num_rows; join->fetch_limit+= num_rows;
@ -1875,7 +1876,7 @@ Cursor::fetch(ulong num_rows)
/* Grab free_list here to correctly free it in close */ /* Grab free_list here to correctly free it in close */
thd->restore_backup_item_arena(this, &backup_arena); 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); (info->ht->set_cursor_read_view)(0);
if (error == NESTED_LOOP_CURSOR_LIMIT) if (error == NESTED_LOOP_CURSOR_LIMIT)