Skip to content

M
MariaDB
Commit 1378eda3 authored by monty@mysql.com's avatar monty@mysql.com
Browse files
Options

After merge fix (Lines lost in manual merge)

parent c44d6124
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
sql/sql_handler.cc
View file @ 1378eda3
...@@ -454,6 +454,9 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, ...@@ -454,6 +454,9 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
if (insert_fields(thd,tables,tables->db,tables->alias,&it)) if (insert_fields(thd,tables,tables->db,tables->alias,&it))
goto err0; goto err0;
select_limit+=offset_limit;
protocol->send_fields(&list,1);
/* /*
In ::external_lock InnoDB resets the fields which tell it that In ::external_lock InnoDB resets the fields which tell it that
the handle is used in the HANDLER interface. Tell it again that the handle is used in the HANDLER interface. Tell it again that
......
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