Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4344cd39
Commit
4344cd39
authored
Jul 29, 2005
by
schwenke@alpha.xl.local
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed two bugs that break Windows build
parent
f0f2738c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
libmysql/libmysql.def
libmysql/libmysql.def
+0
-1
sql/sql_select.cc
sql/sql_select.cc
+3
-2
No files found.
libmysql/libmysql.def
View file @
4344cd39
...
@@ -148,7 +148,6 @@ EXPORTS
...
@@ -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
...
...
sql/sql_select.cc
View file @
4344cd39
...
@@ -1842,6 +1842,7 @@ Cursor::fetch(ulong num_rows)
...
@@ -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)
...
@@ -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)
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment