diff options
| author | unknown <monty@mysql.com> | 2004-05-19 05:09:41 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-19 05:09:41 +0300 |
| commit | 8243f763f09f424b220ec7002ad4b0300b873750 (patch) | |
| tree | a30e034782b8d0fcd3a899a55b1af5a967f23adb /sql | |
| parent | a1c9e9eea04ef87dcb1048be569fc67164cce213 (diff) | |
| parent | 8d71b268de28d17fdd233a6eb2a4370476933bdf (diff) | |
| download | mariadb-git-8243f763f09f424b220ec7002ad4b0300b873750.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
client/mysql.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1bf95b8bded..3aa0e9511a7 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -411,7 +411,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); else sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, - (ulong) info.deleted+info.updated, (ulong) thd->cuted_fields); + (ulong) (info.deleted+info.updated), (ulong) thd->cuted_fields); ::send_ok(thd,info.copied+info.deleted+info.updated,(ulonglong)id,buff); } free_underlaid_joins(thd, &thd->lex->select_lex); @@ -1582,7 +1582,7 @@ bool select_insert::send_eof() (ulong) (info.records - info.copied), (ulong) thd->cuted_fields); else sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records, - (ulong) info.deleted+info.updated, (ulong) thd->cuted_fields); + (ulong) (info.deleted+info.updated), (ulong) thd->cuted_fields); ::send_ok(thd,info.copied+info.deleted+info.updated,last_insert_id,buff); DBUG_RETURN(0); } |