diff options
| author | unknown <guilhem@mysql.com> | 2004-08-23 17:16:22 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-08-23 17:16:22 +0200 |
| commit | 696a303547eef73d5f58c1f8b68189e38913cf37 (patch) | |
| tree | 5e62c20e8cd4a96dad67fc52c3d0ecf7a1340e2b /sql | |
| parent | 1e86cd1ed1638096065cf3d44c31ae19af5c4086 (diff) | |
| parent | e9c25d9336c8d1266254df5f795366e7d280de85 (diff) | |
| download | mariadb-git-696a303547eef73d5f58c1f8b68189e38913cf37.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index b568166a766..555e63b9e32 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -545,15 +545,13 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) int error; DBUG_ENTER("mysql_truncate"); + bzero((char*) &create_info,sizeof(create_info)); /* If it is a temporary table, close and regenerate it */ if (!dont_send_ok && (table_ptr=find_temporary_table(thd,table_list->db, table_list->real_name))) { TABLE *table= *table_ptr; - HA_CREATE_INFO create_info; table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK); - bzero((char*) &create_info,sizeof(create_info)); - create_info.auto_increment_value= table->file->auto_increment_value; db_type table_type=table->db_type; strmov(path,table->path); @@ -596,7 +594,6 @@ int mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) DBUG_RETURN(-1); } - bzero((char*) &create_info,sizeof(create_info)); *fn_ext(path)=0; // Remove the .frm extension error= ha_create_table(path,&create_info,1) ? -1 : 0; query_cache_invalidate3(thd, table_list, 0); |