bk commit into 5.0 tree (aelkin:1.2580) BUG#33329

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.0 repository of aelkin.  When aelkin does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-14 16:28:32+02:00, aelkin@stripped +2 -0
  bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables
  
  changes for an assert and an updated results file.

  mysql-test/r/mix_innodb_myisam_binlog.result@stripped, 2008-02-14 16:28:30+02:00,
aelkin@stripped +1 -1
    results file changed as there is no ROLLBACK query in binlog as it must be.

  sql/sql_update.cc@stripped, 2008-02-14 16:28:31+02:00, aelkin@stripped +1 -1
    refining assert as the initial value of transactional_tables has been
    changed to zero.

diff -Nrup a/mysql-test/r/mix_innodb_myisam_binlog.result
b/mysql-test/r/mix_innodb_myisam_binlog.result
--- a/mysql-test/r/mix_innodb_myisam_binlog.result	2008-02-01 14:18:09 +02:00
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result	2008-02-14 16:28:30 +02:00
@@ -447,7 +447,7 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1)
 ERROR 23000: Duplicate entry '2' for key 1
 show master status /* the offset must denote there is the query */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	369		
+master-bin.000001	230		
 select count(*) from t1 /* must be 4 */;
 count(*)
 4
diff -Nrup a/sql/sql_update.cc b/sql/sql_update.cc
--- a/sql/sql_update.cc	2008-02-04 16:37:38 +02:00
+++ b/sql/sql_update.cc	2008-02-14 16:28:31 +02:00
@@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errco
 
   if (trans_safe)
   {
-    DBUG_ASSERT(transactional_tables);
+    DBUG_ASSERT(!updated || transactional_tables);
     (void) ha_autocommit_or_rollback(thd, 1);
   }
   else