summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <kostja@bodhi.local>2006-11-02 01:08:39 +0300
committerunknown <kostja@bodhi.local>2006-11-02 01:08:39 +0300
commitb6102f671398ac5ccf1b6f1ed0226ee6719e0935 (patch)
tree5d5deeab993fb48853f3373233849f8d87d0423a /sql/sql_update.cc
parent1e64687b86f51a3606efe510cf97dcf6dd4bc8f8 (diff)
parent9280d33474adb8d5848f6467f18e578b740bd3cb (diff)
downloadmariadb-git-b6102f671398ac5ccf1b6f1ed0226ee6719e0935.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1clone-4.1.22-build
into bodhi.local:/opt/local/work/mysql-4.1-runtime mysql-test/r/ps.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: 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.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 6742fbad5c4..20df3b3ab4a 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -408,7 +408,7 @@ int mysql_update(THD *thd,
(ulong) thd->cuted_fields);
send_ok(thd,
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
- 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 */
@@ -1324,6 +1324,6 @@ bool multi_update::send_eof()
(ulong) thd->cuted_fields);
::send_ok(thd,
(thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
- thd->insert_id_used ? thd->insert_id() : 0L,buff);
+ thd->insert_id_used ? thd->last_insert_id : 0L,buff);
return 0;
}