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

@@ -447,7 +447,7 @@ UPDATE t4,t3 SET t4.a=t3.a + bug27417(1) /* top level non-ta table */;
 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

sql/sql_update.cc

@@ -1482,7 +1482,7 @@ void multi_update::send_error(uint errcode,const char *err)
 
   if (trans_safe)
   {
-    DBUG_ASSERT(transactional_tables);
+    DBUG_ASSERT(!updated || transactional_tables);
     (void) ha_autocommit_or_rollback(thd, 1);
   }
   else