diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 17:08:21 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-05 17:50:41 +0200 |
| commit | bae21bfb5de17328c33c3da8d191c6d3af14ae02 (patch) | |
| tree | a7dfd9267b98eb490564df94ca253d953b128f5a /storage/innobase/row/row0merge.cc | |
| parent | d63e19806108efc1ca8d533841ad2471f2e0c4fe (diff) | |
| parent | db55b39fb29979acd3c58581e34f8e51507a1792 (diff) | |
| download | mariadb-git-bae21bfb5de17328c33c3da8d191c6d3af14ae02.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/innobase/row/row0merge.cc')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index 34f83f2fa22..356eec8e7ee 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 2005, 2018, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2005, 2017, 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 @@ -3339,10 +3339,9 @@ 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 = innobase_mysql_tmpdir(); + path = mysql_tmpdir; } static const char label[] = "/Innodb Merge Temp File"; char* name = static_cast<char*>( |