diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 01:10:15 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 01:22:18 +0200 |
| commit | 87d852f102a7f733a774252d9a446377ac51a976 (patch) | |
| tree | cd54a22ca68b201daa24e449d9ce63858d257f0c /storage/innobase/row/row0merge.cc | |
| parent | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (diff) | |
| parent | da34c7de5dacac85c4dc1f714bcd7edf3b7fe5f9 (diff) | |
| download | mariadb-git-87d852f102a7f733a774252d9a446377ac51a976.tar.gz | |
Merge branch 'merge/merge-innodb-5.6' into 10.0
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index ec9b8f79e49..5d3e2d2cca6 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2005, 2017, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2005, 2018, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2014, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under @@ -3138,9 +3138,10 @@ row_merge_file_create_low( file APIs, add instrumentation to register with performance schema */ struct PSI_file_locker* locker = NULL; + PSI_file_locker_state state; if (!path) { - path = mysql_tmpdir; + path = innobase_mysql_tmpdir(); } static const char label[] = "/Innodb Merge Temp File"; char* name = static_cast<char*>( |