bk commit into 6.0 tree (kostja:1.2570)

[konstantin]

Below is the list of changes that have just been committed into a local
6.0 repository of kostja.  When kostja 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-19 15:32:20+03:00, kostja@dipika.(none) +1 -0
  Fix a compile error.

  sql/sql_table.cc@stripped, 2008-02-19 15:32:17+03:00, kostja@dipika.(none) +1 -1
    Fix a compile error.

diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc	2008-02-19 15:04:46 +03:00
+++ b/sql/sql_table.cc	2008-02-19 15:32:17 +03:00
@@ -5714,7 +5714,7 @@ int mysql_fast_or_online_alter_table(THD
     wait_if_global_read_lock(), which could create a deadlock if called
     with LOCK_open.
   */
-  error= ha_commit_stmt(thd);
+  error= ha_autocommit_or_rollback(thd, 0);
 
   if (ha_commit(thd))
     error=1;