database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-02-25 16:04:35 +01:00
parent 6324c36bd7 ff2e82f4a1
commit 0b9a0a3517
1431 changed files with 5960 additions and 2173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/daemon_example/daemon_example.cc
View File

@@ -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),