bzr push into mysql-5.1 branch (msvensson:3059 to 3060)

[Magnus Svensson]

 3060 Magnus Svensson	2008-11-08 [merge]
      Merge
modified:
  sql/mysqld.cc

 3059 Jonas Oreland	2008-11-07
      ndb - rt - fix weird init
modified:
  storage/ndb/src/kernel/vm/Configuration.cpp

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-11-07 15:20:50 +0000
+++ b/sql/mysqld.cc	2008-11-08 09:16:43 +0000
@@ -423,10 +423,10 @@ my_bool opt_ndb_log_update_as_write= FAL
 my_bool opt_ndb_log_updated_only= FALSE;
 my_bool opt_ndb_log_orig= FALSE;
 
-extern const char *opt_ndb_connectstring;
-extern unsigned opt_ndb_constrbuf_len;
-extern const char *opt_ndb_mgmd;
-extern ulong opt_ndb_nodeid;
+extern "C" const char *opt_ndb_connectstring;
+extern "C" unsigned opt_ndb_constrbuf_len;
+extern "C" const char *opt_ndb_mgmd;
+extern "C" ulong opt_ndb_nodeid;
 extern const char *ndb_distribution_names[];
 extern TYPELIB ndb_distribution_typelib;
 extern const char *opt_ndb_distribution;