database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with 3.23

Browse Source 
BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
libmysql/password.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged
mysys/my_tempnam.c:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.server.sh:
  Auto merged
mysql-test/t/temp_table.test:
  Added comment
sql/mysqld.cc:
  Don't apply change from 3.23
sql/sql_show.cc:
  Don't apply change from 3.23
sql/structs.h:
  Don't apply change from 3.23
This commit is contained in:
unknown
2002-12-05 03:52:53 +02:00
parent 591b058518 491415cd03
commit 5fdd9f878f
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_table.cc
View File

@@ -1771,8 +1771,14 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
/* We changed a temporary table */
if (error)
{
/*
* The following function call will also free a
* new_table pointer.
* Therefore, here new_table pointer is not free'd as it is
* free'd in close_temporary() which is called by by the
* close_temporary_table() function.
*/
close_temporary_table(thd,new_db,tmp_name);
my_free((gptr) new_table,MYF(0));
goto err;
}
/* Close lock if this is a transactional table */
@@ -2092,7 +2098,6 @@ copy_data_between_tables(TABLE *from,TABLE *to,
if (to->file->external_lock(thd,F_UNLCK))
error=1;
err:
tmp_error = ha_recovery_logging(thd,TRUE);
free_io_cache(from);
*copied= found_count;
*deleted=delete_count;