bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4114)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4114 Magnus Blåudd	2011-01-14
      ndb
       - my_defaults_extra_file is const char* from 5.6

    modified:
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
=== modified file 'storage/ndb/src/mgmsrv/InitConfigFileParser.cpp'
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2010-10-13 09:33:02 +0000
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2011-01-14 14:13:31 +0000
@@ -17,6 +17,7 @@
 */
 
 #include <ndb_global.h>
+#include <ndb_version.h>
 
 #include "InitConfigFileParser.hpp"
 #include "Config.hpp"
@@ -737,6 +738,9 @@ load_defaults(Vector<struct my_option>&
   BaseString group_suffix;
 
   const char *save_file = my_defaults_file;
+#if MYSQL_VERSION_ID >= 50600
+  const
+#endif
   char *save_extra_file = my_defaults_extra_file;
   const char *save_group_suffix = my_defaults_group_suffix;
 

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