diff options
| author | unknown <svoj@april.(none)> | 2007-03-29 22:01:51 +0500 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2007-03-29 22:01:51 +0500 |
| commit | ab35839a13d820854c4258d8c370cd565b5fbf7e (patch) | |
| tree | 2f6a4e0e43a8f8351ba97684d8e12a165a1b2c3b /mysys/my_redel.c | |
| parent | 805d73c59766775455a843d957d0679129f458a0 (diff) | |
| parent | 817a474c3d767cd9c91cfe2b4240e775a7aa33af (diff) | |
| download | mariadb-git-ab35839a13d820854c4258d8c370cd565b5fbf7e.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
into mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines
mysys/my_redel.c:
Auto merged
Diffstat (limited to 'mysys/my_redel.c')
| -rw-r--r-- | mysys/my_redel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_redel.c b/mysys/my_redel.c index 606d301e1d0..b12cf098283 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.c @@ -59,7 +59,7 @@ int my_redel(const char *org_name, const char *tmp_name, myf MyFlags) MyFlags)) goto end; } - else if (my_delete(org_name,MyFlags)) + else if (my_delete_allow_opened(org_name, MyFlags)) goto end; if (my_rename(tmp_name,org_name,MyFlags)) goto end; |