diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 13:22:53 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 13:22:53 +0000 |
| commit | 347c164c35eddab388009470e6848cb361ac93f8 (patch) | |
| tree | 2c0c44eac690f510bb0a35b2a13b36d606b77b6b /storage/maria/ma_create.c | |
| parent | Releasing progress-linux version 1:10.11.7-4~progress7.99u1. (diff) | |
| download | mariadb-347c164c35eddab388009470e6848cb361ac93f8.tar.xz mariadb-347c164c35eddab388009470e6848cb361ac93f8.zip | |
Merging upstream version 1:10.11.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'storage/maria/ma_create.c')
| -rw-r--r-- | storage/maria/ma_create.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 7fd739d1..9ce48ae9 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -101,7 +101,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, DBUG_ASSERT(maria_inited); - if (flags & HA_CREATE_TMP_TABLE) + if ((flags & HA_CREATE_TMP_TABLE) && !(flags & HA_CREATE_GLOBAL_TMP_TABLE)) common_flag|= MY_THREAD_SPECIFIC; if (!ci) |