Skip to content

Commit a5a6d42

Browse files
committed
ndb
- my_defaults_extra_file is const char* from 5.6
1 parent b310b6b commit a5a6d42

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

storage/ndb/src/mgmsrv/InitConfigFileParser.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
*/
1818

1919
#include <ndb_global.h>
20+
#include <ndb_version.h>
2021

2122
#include "InitConfigFileParser.hpp"
2223
#include "Config.hpp"
@@ -737,6 +738,9 @@ load_defaults(Vector<struct my_option>& options, const char* groups[])
737738
BaseString group_suffix;
738739

739740
const char *save_file = my_defaults_file;
741+
#if MYSQL_VERSION_ID >= 50600
742+
const
743+
#endif
740744
char *save_extra_file = my_defaults_extra_file;
741745
const char *save_group_suffix = my_defaults_group_suffix;
742746

0 commit comments

Comments
 (0)