diff options
| author | dlenev@mockturtle.local <> | 2006-10-02 22:53:10 +0400 |
|---|---|---|
| committer | dlenev@mockturtle.local <> | 2006-10-02 22:53:10 +0400 |
| commit | 8eb4401c5948f6e25e6d9894244d0d8eeea7e652 (patch) | |
| tree | 5bb148bebab77a9d2565aed7985b1dd0c5d3f41d /sql/sql_update.cc | |
| parent | f732270e5bc0de6a4fe768a85a72c84136739452 (diff) | |
| parent | d74621142bc184cd92433ad0872cd2c511791ac9 (diff) | |
| download | mariadb-git-8eb4401c5948f6e25e6d9894244d0d8eeea7e652.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 5405a7fd5c3..a4e05a96f9b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -568,7 +568,7 @@ int mysql_update(THD *thd, thd->row_count_func= (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated; send_ok(thd, (ulong) thd->row_count_func, - thd->insert_id_used ? thd->insert_id() : 0L,buff); + thd->insert_id_used ? thd->last_insert_id : 0L,buff); DBUG_PRINT("info",("%d records updated",updated)); } thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */ @@ -1561,6 +1561,6 @@ bool multi_update::send_eof() thd->row_count_func= (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated; ::send_ok(thd, (ulong) thd->row_count_func, - thd->insert_id_used ? thd->insert_id() : 0L,buff); + thd->insert_id_used ? thd->last_insert_id : 0L,buff); return FALSE; } |