← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty

« back to all changes in this revision

Viewing changes to plugin/daemon_example/daemon_example.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
Tags: 5.5.36-1
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/daemon_example/daemon_example.cc
162
162
  struct tm tm_tmp;
163
163
 
164
164
  pthread_cancel(con->heartbeat_thread);
 
165
  pthread_join(con->heartbeat_thread, NULL);
165
166
 
166
167
  localtime_r(&result, &tm_tmp);
167
168
  my_snprintf(buffer, sizeof(buffer),