Commit e2e51911 authored by unknown's avatar unknown
Browse files

Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents ce22ebd0 c8723e7f

mysql-test/r/innodb.result

+1 −0
Original line number Diff line number Diff line
@@ -878,6 +878,7 @@ truncate table t1; 
ERROR HY000: 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);

mysql-test/t/innodb.test

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ insert into t1 values(1),(2); 
truncate table t1;

commit;

truncate table t1;

truncate table t1;

select * from t1;

insert into t1 values(1),(2);

delete from t1;

sql/sql_delete.cc

+3 −0
Original line number Diff line number Diff line
@@ -649,11 +649,14 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 
    if (!ha_supports_generate(table_type))

    {

      /* Probably InnoDB table */

      ulong save_options= thd->options;

      table_list->lock_type= TL_WRITE;

      thd->options&= ~(ulong) (OPTION_BEGIN | OPTION_NOT_AUTOCOMMIT);

      ha_enable_transaction(thd, FALSE);

      error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0,

			  HA_POS_ERROR, 0);

      ha_enable_transaction(thd, TRUE);

      thd->options= save_options;

      DBUG_RETURN(error);

    }

    if (lock_and_wait_for_table_name(thd, table_list))