diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-04 20:52:42 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-04 20:52:42 +0200 |
| commit | c151ea1f129b361f906131d8867c7472f6ec2970 (patch) | |
| tree | e6f08c20d1d92e984a2188cfbf663c52f1570b88 /sql/sql_table.cc | |
| parent | ad6e0804017b2a54a33aa643efe2bb374c0a95b6 (diff) | |
| parent | 76c982ea9288bdc55746b63d03ff82d6a89f02ec (diff) | |
| download | mariadb-git-c151ea1f129b361f906131d8867c7472f6ec2970.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 0a09b6232e8..ec866b927e6 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1528,8 +1528,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 */ |