bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3352)

[Martin Zaun]

#At file:///Users/mz/mysql/ndb-6.3/ based on revid:jonas@stripped

 3352 Martin Zaun	2010-11-28 [merge]
      merge from ndb-6.3-duplicate-symbols-fix to ndb-6.3

    modified:
      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-03 09:16:27 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2010-11-28 10:56:59 +0000
@@ -76,10 +76,6 @@ const char * g_dummy;
 char * g_env_path = 0;
 const char* g_mysqld_host = 0;
 
-/** Dummy, extern declared in ndb_opts.h */
-int g_print_full_config = 0, opt_ndb_shm;
-my_bool opt_core;
-
 static struct my_option g_options[] =
 {
   { "help", '?', "Display this help and exit.", 


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