summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-09-03 15:53:38 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-09-03 15:53:38 +0300
commitc9cf6b13f6f9aaae57efb514e0b0f51e7ea09798 (patch)
tree810d8e37f7b3dded1323a79ce43f14603679c0a7 /storage/maria
parentb795adcff72a84421576748646e2446e3ef24202 (diff)
parent33ae1616e01b564d03c507769564d37c582783cf (diff)
downloadmariadb-git-c9cf6b13f6f9aaae57efb514e0b0f51e7ea09798.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/ma_create.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c
index b94f503641a..3bf5dbd8a29 100644
--- a/storage/maria/ma_create.c
+++ b/storage/maria/ma_create.c
@@ -318,7 +318,7 @@ int maria_create(const char *name, enum data_file_type datafile_type,
{
options|= HA_OPTION_TMP_TABLE;
tmp_table= TRUE;
- create_mode|= O_NOFOLLOW;
+ create_mode|= O_NOFOLLOW | (internal_table ? 0 : O_EXCL);
/* "CREATE TEMPORARY" tables are not crash-safe (dropped at restart) */
ci->transactional= FALSE;
flags&= ~HA_CREATE_PAGE_CHECKSUM;
@@ -891,8 +891,8 @@ int maria_create(const char *name, enum data_file_type datafile_type,
{
char *iext= strrchr(name, '.');
int have_iext= iext && !strcmp(iext, MARIA_NAME_IEXT);
- fn_format(kfilename, name, "", MARIA_NAME_IEXT,
- MY_UNPACK_FILENAME | MY_RETURN_REAL_PATH |
+ fn_format(kfilename, name, "", MARIA_NAME_IEXT, MY_UNPACK_FILENAME |
+ (internal_table ? 0 : MY_RETURN_REAL_PATH) |
(have_iext ? MY_REPLACE_EXT : MY_APPEND_EXT));
/*
Replace the current file.