diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-02-25 16:04:35 +0100 |
| commit | 0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2 (patch) | |
| tree | 5c67457ff8abbb89b203a7f55cda776b738c385b /plugin | |
| parent | 6324c36bd703a0f55dcd49dd721af262f73cf7aa (diff) | |
| parent | ff2e82f4a175b7b023cd167b2fa6e6fcd1bd192e (diff) | |
| download | mariadb-git-0b9a0a3517ca2b75655f3af5c372cf333d3d5fe2.tar.gz | |
5.5 merge
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/daemon_example.cc | 1 | ||||
| -rw-r--r-- | plugin/win_auth_client/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugin/daemon_example/daemon_example.cc b/plugin/daemon_example/daemon_example.cc index 7d047b2eaf7..ffa9789a0e9 100644 --- a/plugin/daemon_example/daemon_example.cc +++ b/plugin/daemon_example/daemon_example.cc @@ -162,6 +162,7 @@ static int daemon_example_plugin_deinit(void *p __attribute__ ((unused))) struct tm tm_tmp; pthread_cancel(con->heartbeat_thread); + pthread_join(con->heartbeat_thread, NULL); localtime_r(&result, &tm_tmp); my_snprintf(buffer, sizeof(buffer), diff --git a/plugin/win_auth_client/CMakeLists.txt b/plugin/win_auth_client/CMakeLists.txt index f3d3e54958e..a017410252d 100644 --- a/plugin/win_auth_client/CMakeLists.txt +++ b/plugin/win_auth_client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by |