Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.0

into hundin.mysql.fi:/home/igor/dev/mysql-4.0

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/igor/dev/mysql-4.0
b5e40f68 · unknown · 046c6681 · 4832d06f · b5e40f68 · b5e40f68
Commit b5e40f68 authored Apr 26, 2003 by unknown
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

BitKeeper/etc/logging_ok BitKeeper/etc/logging_ok +1 -0

sql/sql_insert.cc sql/sql_insert.cc +1 -1

No files found.
--- 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

--- 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;
  }