diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 03:18:14 +0200 |
| commit | 8e15768731c52b6bbb29d7bfe27bdd71c025a3a3 (patch) | |
| tree | 3148e77619dba81f92ab25d604079b46689e58b8 /storage/innobase/row/row0ftsort.cc | |
| parent | ebb8c9fb26f86cff8c0d81bd2415f415cef952bb (diff) | |
| parent | 66744f4540c464413055a79111c34449e8381618 (diff) | |
| download | mariadb-git-8e15768731c52b6bbb29d7bfe27bdd71c025a3a3.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index cc676af4ef3..83a6bd5a2e7 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1017,7 +1017,7 @@ fts_parallel_merge( CloseHandle(psort_info->thread_hdl); #endif /*__WIN__ */ - os_thread_exit(NULL); + os_thread_exit(NULL, false); OS_THREAD_DUMMY_RETURN; } |