mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
fixes after merge. Now it compiles and passes the test suite
Docs/manual.texi: fixed bug from merge sql/sql_delete.cc: examined rows fix sql/sql_select.cc: fix bugs from merge sql/sql_update.cc: examined rows merge completion sql/sql_yacc.yy: fixed bugs from merge
This commit is contained in:
@@ -800,6 +800,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
|
||||
|
||||
err:
|
||||
thd->limit_found_rows = join.send_records;
|
||||
thd->examined_row_count = join.examined_rows;
|
||||
thd->proc_info="end";
|
||||
join.lock=0; // It's faster to unlock later
|
||||
join_free(&join);
|
||||
@@ -2546,7 +2547,6 @@ join_free(JOIN *join)
|
||||
delete tab->select;
|
||||
delete tab->quick;
|
||||
x_free(tab->cache.buff);
|
||||
end_read_record(&tab->read_record);
|
||||
if (tab->table)
|
||||
{
|
||||
if (tab->table->key_read)
|
||||
|
||||
Reference in New Issue
Block a user