List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:May 25 2010 1:43pm
Subject:bzr push into mysql-next-mr-bugfixing branch (jonathan.perkin:3199 to 3200)
View as plain text  
 3200 Jonathan Perkin	2010-05-25 [merge]
      Merge from mysql-trunk-bugfixing

    modified:
      plugin/daemon_example/daemon_example.cc
 3199 Mattias Jonsson	2010-05-25 [merge]
      merge

    modified:
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
=== modified file 'plugin/daemon_example/daemon_example.cc'
--- a/plugin/daemon_example/daemon_example.cc	2010-03-31 14:05:33 +0000
+++ b/plugin/daemon_example/daemon_example.cc	2010-05-25 13:37:35 +0000
@@ -16,6 +16,7 @@
 #include <sql_priv.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <time.h>				// localtime_r
 #include <mysql_version.h>
 #include <mysql/plugin.h>
 #include <my_global.h>


Attachment: [text/bzr-bundle] bzr/jonathan.perkin@oracle.com-20100525133936-41ftfxi9bwy4wppe.bundle
Thread
• bzr push into mysql-next-mr-bugfixing branch (jonathan.perkin:3199 to 3200) Jonathan Perkin25 May