Commit 6318e449 authored by unknown's avatar unknown
Browse files

Bug#11816 - Truncate table doesn't work with temporary innodb tables 

Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.


mysql-test/r/innodb.result:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test result.
mysql-test/t/innodb.test:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  The test case.
sql/sql_delete.cc:
  Bug#11816 - Truncate table doesn't work with temporary innodb tables
  Handle temporary tables like permanent tables: If the storage engine
  cannot truncate, delete instead.
  Replaced a numeric literal by its symbolic name.
parent 0f7161b0

mysql-test/r/innodb.result

+16 −0
Original line number Diff line number Diff line
@@ -1658,3 +1658,19 @@ a_id b_list 
3	NULL

DROP TABLE t2;

DROP TABLE t1;

create temporary table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

a

42

drop table t1;

create table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

a

42

drop table t1;

mysql-test/t/innodb.test

+18 −0
Original line number Diff line number Diff line
@@ -1202,4 +1202,22 @@ SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t 
DROP TABLE t2;

DROP TABLE t1;



#

# Bug#11816 - Truncate table doesn't work with temporary innodb tables

# This is not an innodb bug, but we test it using innodb.

#

create temporary table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

drop table t1;

# Show that it works with permanent tables too.

create table t1 (a int) engine=innodb;

insert into t1 values (4711);

truncate t1;

insert into t1 values (42);

select * from t1;

drop table t1;



# End of 4.1 tests

sql/sql_delete.cc

+16 −13
Original line number Diff line number Diff line
@@ -617,6 +617,8 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 
    TABLE *table= *table_ptr;

    table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);

    db_type table_type=table->db_type;

    if (!ha_supports_generate(table_type))

      goto trunc_by_del;

    strmov(path,table->path);

    *table_ptr= table->next;			// Unlink table from list

    close_temporary(table,0);
@@ -635,7 +637,7 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 


  (void) sprintf(path,"%s/%s/%s%s",mysql_data_home,table_list->db,

		 table_list->real_name,reg_ext);

  fn_format(path,path,"","",4);

  fn_format(path, path, "", "", MY_UNPACK_FILENAME);



  if (!dont_send_ok)

  {
@@ -647,18 +649,7 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 
      DBUG_RETURN(-1);

    }

    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);

    }

      goto trunc_by_del;

    if (lock_and_wait_for_table_name(thd, table_list))

      DBUG_RETURN(-1);

  }
@@ -693,4 +684,16 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) 
    VOID(pthread_mutex_unlock(&LOCK_open));

  }

  DBUG_RETURN(error ? -1 : 0);



 trunc_by_del:

  /* 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);

}