Skip to content

M
mariadb
Commit a9565261 authored by unknown's avatar unknown
Browse files
Options

hack removed

parent eba2f5bc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
sql/sql_select.cc
View file @ a9565261
...@@ -1846,8 +1846,7 @@ Cursor::fetch(ulong num_rows) ...@@ -1846,8 +1846,7 @@ Cursor::fetch(ulong num_rows)
switch (error) { switch (error) {
/* Fetch limit worked, possibly more rows are there */ /* Fetch limit worked, possibly more rows are there */
case -4: case -4:
if (thd->transaction.all.innobase_tid) ha_release_temporary_latches(thd);
ha_release_temporary_latches(thd);
thd->server_status|= SERVER_STATUS_CURSOR_EXISTS; thd->server_status|= SERVER_STATUS_CURSOR_EXISTS;
::send_eof(thd); ::send_eof(thd);
thd->server_status&= ~SERVER_STATUS_CURSOR_EXISTS; thd->server_status&= ~SERVER_STATUS_CURSOR_EXISTS;
...@@ -1860,8 +1859,7 @@ Cursor::fetch(ulong num_rows) ...@@ -1860,8 +1859,7 @@ Cursor::fetch(ulong num_rows)
error= 0; error= 0;
/* fallthrough */ /* fallthrough */
case 0: /* No more rows */ case 0: /* No more rows */
if (thd->transaction.all.innobase_tid) ha_release_temporary_latches(thd);
ha_release_temporary_latches(thd);
close(); close();
thd->server_status|= SERVER_STATUS_LAST_ROW_SENT; thd->server_status|= SERVER_STATUS_LAST_ROW_SENT;
::send_eof(thd); ::send_eof(thd);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7