bzr commit into mysql-6.0 branch (hezx:2669) WL#4398

[He Zhenxing]

#At file:///media/sda3/work/mysql/bzrwork/semisync/6.0-rpl/

 2669 He Zhenxing	2008-06-28 [merge]
      Fix after push WL#4398
modified:
  sql/Makefile.am
  sql/handler.cc
  sql/sql_parse.cc

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2008-06-28 02:49:04 +0000
+++ b/sql/Makefile.am	2008-06-28 06:59:02 +0000
@@ -89,7 +89,7 @@ noinst_HEADERS =	item.h item_func.h item
 			sql_partition.h partition_info.h partition_element.h \
 			probes.h sql_audit.h \
 			contributors.h sql_servers.h ddl_blocker.h si_objects.h \
-			rpl_handler.h
+			rpl_handler.h replication.h
 
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2008-06-28 02:49:04 +0000
+++ b/sql/handler.cc	2008-06-28 06:59:02 +0000
@@ -1316,7 +1316,14 @@ int ha_autocommit_or_rollback(THD *thd, 
 
     thd->variables.tx_isolation=thd->session_tx_isolation;
   }
+  else
 #endif
+  {
+    if (!thd->is_error())
+      RUN_HOOK(transaction, after_commit, (thd, 0));
+    else
+      RUN_HOOK(transaction, after_rollback, (thd, 0));
+  }
   DBUG_RETURN(error);
 }
 

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2008-06-28 02:49:04 +0000
+++ b/sql/sql_parse.cc	2008-06-28 06:59:02 +0000
@@ -1409,17 +1409,7 @@ bool dispatch_command(enum enum_server_c
 
   /* If commit fails, we should be able to reset the OK status. */
   thd->main_da.can_overwrite_status= TRUE;
-  if (thd->transaction.stmt.ha_list)
-  {
-    ha_autocommit_or_rollback(thd, thd->is_error());
-  }
-  else
-  {
-    if (!thd->is_error())
-      RUN_HOOK(transaction, after_commit, (thd, 0));
-    else
-      RUN_HOOK(transaction, after_rollback, (thd, 0));
-  }
+  ha_autocommit_or_rollback(thd, thd->is_error());
   thd->main_da.can_overwrite_status= FALSE;
 
   thd->transaction.stmt.reset();