diff options
| author | unknown <igor@hundin.mysql.fi> | 2003-04-26 15:53:28 +0300 |
|---|---|---|
| committer | unknown <igor@hundin.mysql.fi> | 2003-04-26 15:53:28 +0300 |
| commit | b5e40f6823528d5e99ca4e7f581e3db1b0a53c8c (patch) | |
| tree | 303a2d7ba33aa51f43b7b05309066c80998b5776 | |
| parent | 046c66819fafd0f83dc16fda56c5b249c8b195c2 (diff) | |
| parent | 4832d06f9251b3b0f26655efec90b3f2b745082e (diff) | |
| download | mariadb-git-b5e40f6823528d5e99ca4e7f581e3db1b0a53c8c.tar.gz | |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/igor/dev/mysql-4.0
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_insert.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 2112a7c8dce..aca77159202 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -11,6 +11,7 @@ arjen@fred.bitbike.com arjen@george.bitbike.com bar@bar.mysql.r18.ru bar@bar.udmsearch.izhnet.ru +bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk davida@isil.mysql.com diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ace15771449..0e7a487276d 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1392,7 +1392,7 @@ bool select_insert::send_eof() thd->cuted_fields); if (last_insert_id) thd->insert_id(last_insert_id); // For update log - ::send_ok(&thd->net,info.copied,last_insert_id,buff); + ::send_ok(&thd->net,info.copied+info.deleted,last_insert_id,buff); mysql_update_log.write(thd,thd->query,thd->query_length); return 0; } |