List:Commits« Previous MessageNext Message »
From:Martin Zaun Date:November 28 2010 12:46pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:4026 to 4027)
View as plain text  
 4027 Martin Zaun	2010-11-28 [merge]
      ndb - merge from 6.3 to 7.0

    modified:
      .bzrignore
      storage/ndb/test/run-test/main.cpp
 4026 jonas oreland	2010-11-28 [merge]
      ndb - merge 63 to 70

    modified:
      sql/ha_ndbcluster.cc
=== modified file '.bzrignore'
--- a/.bzrignore	2010-02-24 14:30:56 +0000
+++ b/.bzrignore	2010-11-28 12:27:13 +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:17:42 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2010-11-28 12:27:13 +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/martin.zaun@oracle.com-20101128122713-kyonuimoqj10ueax.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:4026 to 4027) Martin Zaun28 Nov