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)
List-Archive: http://lists.mysql.com/commits/125262
Message-Id: <201011281246.oASA8TBk031015@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1608634857=="

--===============1608634857==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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.", 


--===============1608634857==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.0/
# testament_sha1: 039032339e5d632b173ae0525ca9998e482bf574
# timestamp: 2010-11-28 13:46:12 +0100
# source_branch: file:///Users/mz/mysql/ndb-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
bITgjy8pYfwzjtH6WKViiqlYorUqrKK+57wyN59lxoPdHMrrPMsLB0xLmA17n+pGHIpF5isWSEsN
RylEfzLC6SGpU0KJ6LDGJsLqKUU2RKd1Sa/dfkUxeBvONz6ybmQ2qRMqEuGMsJ8F/8+SnlObxp+J
9H0rFJrXS9EmoPZPyWOA1r46OQ2+UkLpE6Y0TNdD3uJsx/BalT7E3T3nXz9ChQl7YoMsz/fojrR5
mnBK5m8xsRTo8zq4yWiki188FuuqVkh3pInMoOVxHhofJaOBkwU+muZlsMt8u4lmvEoEvuUJ7zgj
9cPWZKMUr42nq6TWUOVVDOlKSjYfX2Cp7xqaUUolKKfJ9lFFH7yecjWDsTZE2NH1WdDyun0nfrTr
01vcq+1CW+lPFGcngeCLS9NMir2FD5uLDVTRkZ4uqH0cBeXTI75n5OYqEt2o9zXm1t0iWE/vTDwx
ytJ3GiMXhMOf5HJHwe6O81D6m2NSkkNGZZxRhJc/Y/E1ZZzu8ePe0nZ2cFofxM3czdOB7mSMcp0+
79MSmh+xypObhSKHE21WWlk+uyJ9CbVs+l0ticDTsMm6R/EyksYeZs/MkO5uj0WmDeeZnN+6Zbzr
/+LuSKcKEhdGNr4A


--===============1608634857==--