diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-05-10 17:08:29 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-05-10 17:08:29 -0600 |
| commit | 174fdf05a14cecb499030460ecceed5f4df79cf9 (patch) | |
| tree | 11abf19d830918f05275466099b07d15bd3fba78 /sql/sql_update.cc | |
| parent | 9192600eb7c52f2675a67548849409dec2364165 (diff) | |
| download | mariadb-git-174fdf05a14cecb499030460ecceed5f4df79cf9.tar.gz | |
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
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 3cba3b4be6a..b6b22ecbc99 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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; |