diff options
| author | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-02-26 19:23:11 +0400 |
| commit | 29a99fa0bee7136d10214d84aa3b484168b60c46 (patch) | |
| tree | dc2dc0d975a191c52bdf40ae8e82b0ae8256c7cc /sql/sql_table.cc | |
| parent | d2b0d3fa88a894c6380e577eaa8d10b81f667566 (diff) | |
| parent | e0100ed8865823b724f899be74a3092db120bbf6 (diff) | |
| download | mariadb-git-29a99fa0bee7136d10214d84aa3b484168b60c46.tar.gz | |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/work/mysql-4.1
sql/spatial.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a5e07379f59..699818b19fd 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -247,7 +247,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists, { if (wrong_tables.length()) wrong_tables.append(','); - wrong_tables.append(String(table->real_name,default_charset_info)); + wrong_tables.append(String(table->real_name,system_charset_info)); } } thd->tmp_table_used= tmp_table_deleted; @@ -1649,6 +1649,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, new_db=db; used_fields=create_info->used_fields; + mysql_ha_closeall(thd, table_list); if (!(table=open_ltable(thd,table_list,TL_WRITE_ALLOW_READ))) DBUG_RETURN(-1); |