bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4001)

[Martin Zaun]

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

 4001 Martin Zaun	2010-11-28 [merge]
      ndb - merge from 7.0 to 7.1

    modified:
      .bzrignore
      storage/ndb/test/run-test/main.cpp
=== modified file '.bzrignore'
--- a/.bzrignore	2010-10-08 11:17:35 +0000
+++ b/.bzrignore	2010-11-28 12:44:36 +0000
@@ -2806,6 +2806,7 @@ storage/ndb/test/ndbapi/testLimits
 storage/ndb/test/ndbapi/testMgm
 storage/ndb/test/ndbapi/testMgmd
 storage/ndb/test/ndbapi/testNDBT
+storage/ndb/test/ndbapi/testNativeDefault
 storage/ndb/test/ndbapi/testNdbApi
 storage/ndb/test/ndbapi/testNdbinfo
 storage/ndb/test/ndbapi/testNodeRestart
@@ -2817,8 +2818,9 @@ storage/ndb/test/ndbapi/testReconnect
 storage/ndb/test/ndbapi/testRestartGci
 storage/ndb/test/ndbapi/testSRBank
 storage/ndb/test/ndbapi/testScan
-storage/ndb/test/ndbapi/testScanFilter
 storage/ndb/test/ndbapi/testScan.dsp
+storage/ndb/test/ndbapi/testScanFilter
+storage/ndb/test/ndbapi/testScanFilter
 storage/ndb/test/ndbapi/testScanInterpreter
 storage/ndb/test/ndbapi/testScanPerf
 storage/ndb/test/ndbapi/testSingleUserMode

=== modified file 'storage/ndb/test/run-test/main.cpp'
--- a/storage/ndb/test/run-test/main.cpp	2010-08-03 09:30:56 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2010-11-28 12:44:36 +0000
@@ -81,10 +81,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;
-my_bool opt_core;
-
 static struct my_option g_options[] =
 {
   { "help", '?', "Display this help and exit.", 


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