bzr push into mysql-5.1-telco-7.1 branch (jorgen.austvik:3712)

[Jorgen Austvik]

 3712 Jorgen Austvik	2010-08-03 [merge]
      Merge

    modified:
      storage/ndb/Makefile.am
=== modified file 'storage/ndb/test/run-test/main.cpp'

=== modified file 'storage/ndb/test/run-test/main.cpp'
--- a/storage/ndb/test/run-test/main.cpp	2010-08-02 11:49:11 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2010-08-03 09:30:56 +0000
@@ -442,7 +442,7 @@
       {
         g_logger.debug("Timed out");
 	result = ERR_MAX_TIME_ELAPSED;
-        g_logger.info("Timeout '%s' after %d seconds", test_case.m_name, test_case.m_max_time);
+        g_logger.info("Timeout '%s' after %ld seconds", test_case.m_name.c_str(), test_case.m_max_time);
 	break;
       }
       NdbSleep_SecSleep(1);
@@ -527,7 +527,7 @@
   return return_code;
 }
 
-static 
+extern "C"
 my_bool 
 get_one_option(int arg, const struct my_option * opt, char * value)
 {


Attachment: [text/bzr-bundle] bzr/[e-mail]