database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rpl

Browse Source 
into  dl145j.mysql.com:/tmp/andrei/5.1-merge
This commit is contained in:
aelkin@dl145j.mysql.com
2007-09-15 21:25:56 +02:00
parent 17f804f8d3 341e484f77
commit 1a0fea60a3
7 changed files with 337 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_update.cc
View File

@ -797,7 +797,7 @@ int mysql_update(THD *thd,
Sometimes we want to binlog even if we updated no rows, in case user used
it to be sure master and slave are in same state.
*/
if ((error < 0) || (updated && !transactional_table))
if ((error < 0) || thd->transaction.stmt.modified_non_trans_table)
{
if (mysql_bin_log.is_open())
{