After merge fix (Lines lost in manual merge)

1378eda3 · monty@mysql.com · c44d6124 · 1378eda3
Commit 1378eda3 authored Jan 09, 2006 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/sql_handler.cc sql/sql_handler.cc +3 -0

No files found.
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -454,6 +454,9 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
  if (insert_fields(thd,tables,tables->db,tables->alias,&it))
    goto err0;

+  select_limit+=offset_limit;
+  protocol->send_fields(&list,1);
+
  /*
    In ::external_lock InnoDB resets the fields which tell it that
    the handle is used in the HANDLER interface. Tell it again that