After merge fix (Lines lost in manual merge)
This commit is contained in:
parent
13c27a9704
commit
e12bc697db
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user