diff options
| author | unknown <dlenev@mockturtle.local> | 2006-10-02 22:53:10 +0400 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2006-10-02 22:53:10 +0400 |
| commit | 2e2198633e71cfb77dc95f17bfe8f6bb88d63424 (patch) | |
| tree | 5bb148bebab77a9d2565aed7985b1dd0c5d3f41d /sql/sql_update.cc | |
| parent | 72bff0c960590e45d42fcc51d627ccb1c3c055a8 (diff) | |
| parent | 84000c374b5e4e2fa61a11481bf65a87f0b123a1 (diff) | |
| download | mariadb-git-2e2198633e71cfb77dc95f17bfe8f6bb88d63424.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
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; } |