bk commit into 4.0 tree (serg:1.2081) BUG#8151

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
4.0 repository of serg. When serg 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
  1.2081 05/04/14 18:14:54 serg@stripped +3 -0
  TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
  bug#8151

  sql/sql_delete.cc
    1.110 05/04/14 18:14:50 serg@stripped +6 -2
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

  mysql-test/t/innodb.test
    1.55 05/04/14 18:14:50 serg@stripped +1 -0
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

  mysql-test/r/innodb.result
    1.80 05/04/14 18:14:50 serg@stripped +1 -0
    TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
    bug#8151

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	serg
# Host:	serg.mylan
# Root:	/usr/home/serg/Abk/mysql-4.0

--- 1.109/sql/sql_delete.cc	Wed Feb 16 03:43:07 2005
+++ 1.110/sql/sql_delete.cc	Thu Apr 14 18:14:50 2005
@@ -590,8 +590,12 @@
     {
       /* Probably InnoDB table */
       table_list->lock_type= TL_WRITE;
-      DBUG_RETURN(mysql_delete(thd, table_list, (COND*) 0, (ORDER*) 0,
-			       HA_POS_ERROR, 0));
+      ulong save_options= thd->options;
+      thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);
+      int res= mysql_delete(thd, table_list, (COND*) 0, (ORDER*) 0,
+			       HA_POS_ERROR, 0);
+      thd->options= save_options;
+      DBUG_RETURN(res);
     }
     if (lock_and_wait_for_table_name(thd, table_list))
       DBUG_RETURN(-1);

--- 1.79/mysql-test/r/innodb.result	Thu Jul 15 14:46:19 2004
+++ 1.80/mysql-test/r/innodb.result	Thu Apr 14 18:14:50 2005
@@ -821,6 +821,7 @@
 Can't execute the given command because you have active locked tables or an active transaction
 commit;
 truncate table t1;
+truncate table t1;
 select * from t1;
 a
 insert into t1 values(1),(2);

--- 1.54/mysql-test/t/innodb.test	Thu Jul 15 14:46:19 2004
+++ 1.55/mysql-test/t/innodb.test	Thu Apr 14 18:14:50 2005
@@ -528,6 +528,7 @@
 truncate table t1;
 commit;
 truncate table t1;
+truncate table t1;
 select * from t1;
 insert into t1 values(1),(2);
 delete from t1;