diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:32:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:38:34 +0200 |
| commit | cb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch) | |
| tree | 29d130592e3dfea50251771979fbaa6923d44ba9 /storage/maria/ma_recovery.c | |
| parent | a4885dde4ccec68bbb0268796f62e68e08ba4837 (diff) | |
| parent | 48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff) | |
| download | mariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/maria/ma_recovery.c')
| -rw-r--r-- | storage/maria/ma_recovery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c index d0e0210db64..b1d2378870f 100644 --- a/storage/maria/ma_recovery.c +++ b/storage/maria/ma_recovery.c @@ -887,9 +887,7 @@ prototype_redo_exec_hook(REDO_CREATE_TABLE) if (create_database_if_not_exists(name)) goto end; fn_format(filename, name, "", MARIA_NAME_IEXT, - (MY_UNPACK_FILENAME | - (flags & HA_DONT_TOUCH_DATA) ? MY_RETURN_REAL_PATH : 0) | - MY_APPEND_EXT); + MY_UNPACK_FILENAME | MY_RETURN_REAL_PATH | MY_APPEND_EXT); linkname_ptr= NULL; create_flag= MY_DELETE_OLD; tprint(tracef, "Table '%s' creating as '%s'\n", name, filename); |