diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:10:49 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-11-27 23:10:49 -0700 |
| commit | f50b95d29a086d23132d557fbec3e6129ae81a3f (patch) | |
| tree | 39bb69a9d25395c95dbba09f15eba543e26775c8 /sql/sql_table.cc | |
| parent | c5a8038661fc912198401777612a944cbdfb5f6c (diff) | |
| parent | 2e3896ecf1b4b196ed0e229583c3a45c754d1ce7 (diff) | |
| download | mariadb-git-f50b95d29a086d23132d557fbec3e6129ae81a3f.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into mysql.sashanet.com:/home/sasha/src/bk/mysql
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index a300808e6c3..fe0c7f7e60e 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -1482,7 +1482,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name, } } -#ifdef __WIN__ +#if defined( __WIN__) || defined( __EMX__) // Win32 can't rename an open table, so we must close the org table! table_name=thd->strdup(table_name); // must be saved if (close_cached_table(thd,table)) |