1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into hundin.mysql.fi:/home/igor/dev/mysql-4.0
This commit is contained in:
unknown 2003-04-26 15:53:28 +03:00
commit b5e40f6823
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@ -11,6 +11,7 @@ arjen@fred.bitbike.com
arjen@george.bitbike.com arjen@george.bitbike.com
bar@bar.mysql.r18.ru bar@bar.mysql.r18.ru
bar@bar.udmsearch.izhnet.ru bar@bar.udmsearch.izhnet.ru
bell@laptop.sanja.is.com.ua
bell@sanja.is.com.ua bell@sanja.is.com.ua
bk@admin.bk bk@admin.bk
davida@isil.mysql.com davida@isil.mysql.com

2
sql/sql_insert.cc
View File

@ -1392,7 +1392,7 @@ bool select_insert::send_eof()
thd->cuted_fields); thd->cuted_fields);
if (last_insert_id) if (last_insert_id)
thd->insert_id(last_insert_id); // For update log 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); mysql_update_log.write(thd,thd->query,thd->query_length);
return 0; return 0;
} }