mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +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:
@ -175,6 +175,7 @@ int mysql_update(THD *thd,
|
||||
TABLE_LIST tables;
|
||||
List<Item> fields;
|
||||
List<Item> all_fields;
|
||||
ha_rows examined_rows;
|
||||
|
||||
bzero((char*) &tables,sizeof(tables));
|
||||
tables.table = table;
|
||||
@ -184,7 +185,8 @@ int mysql_update(THD *thd,
|
||||
if (setup_order(thd, &tables, fields, all_fields, order) ||
|
||||
!(sortorder=make_unireg_sortorder(order, &length)) ||
|
||||
(table->found_records = filesort(&table, sortorder, length,
|
||||
(SQL_SELECT *) 0, 0L, HA_POS_ERROR))
|
||||
(SQL_SELECT *) 0, 0L,
|
||||
HA_POS_ERROR, &examined_rows))
|
||||
== HA_POS_ERROR)
|
||||
{
|
||||
delete select;
|
||||
|
Reference in New Issue
Block a user