From: Martin Zaun
Date: November 28 2010 12:15pm
Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3352)
List-Archive: http://lists.mysql.com/commits/125259
Message-Id: <201011281216.oASCA8dI001138@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1609278068=="

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

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

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

    modified:
      .bzrignore
      storage/ndb/test/run-test/main.cpp
=== modified file '.bzrignore'
--- a/.bzrignore	2010-02-12 14:17:23 +0000
+++ b/.bzrignore	2010-11-28 11:02:30 +0000
@@ -2765,6 +2765,7 @@ storage/ndb/src/ndbapi/libndbapi.dsp
 storage/ndb/src/ndbapi/ndberror_check
 storage/ndb/test/ndbapi/DbAsyncGenerator
 storage/ndb/test/ndbapi/DbCreate
+storage/ndb/test/ndbapi/NdbRepStress
 storage/ndb/test/ndbapi/bank/bankCreator
 storage/ndb/test/ndbapi/bank/bankMakeGL
 storage/ndb/test/ndbapi/bank/bankSumAccounts
@@ -2780,6 +2781,9 @@ storage/ndb/test/ndbapi/flexBench
 storage/ndb/test/ndbapi/flexBench.dsp
 storage/ndb/test/ndbapi/flexHammer
 storage/ndb/test/ndbapi/flexTT
+storage/ndb/test/ndbapi/msa
+storage/ndb/test/ndbapi/ndbapi_50compat0
+storage/ndb/test/ndbapi/ndbapi_50compat1
 storage/ndb/test/ndbapi/ndbapi_slow_select
 storage/ndb/test/ndbapi/testBackup
 storage/ndb/test/ndbapi/testBasic
@@ -2796,27 +2800,32 @@ storage/ndb/test/ndbapi/testIndexStat
 storage/ndb/test/ndbapi/testInterpreter
 storage/ndb/test/ndbapi/testLcp
 storage/ndb/test/ndbapi/testMgm
+storage/ndb/test/ndbapi/testNDBT
 storage/ndb/test/ndbapi/testNdbApi
 storage/ndb/test/ndbapi/testNodeRestart
 storage/ndb/test/ndbapi/testOIBasic
 storage/ndb/test/ndbapi/testOperations
 storage/ndb/test/ndbapi/testPartitioning
 storage/ndb/test/ndbapi/testReadPerf
+storage/ndb/test/ndbapi/testReconnect
 storage/ndb/test/ndbapi/testRestartGci
 storage/ndb/test/ndbapi/testSRBank
 storage/ndb/test/ndbapi/testScan
 storage/ndb/test/ndbapi/testScan.dsp
+storage/ndb/test/ndbapi/testScanFilter
 storage/ndb/test/ndbapi/testScanInterpreter
 storage/ndb/test/ndbapi/testScanPerf
 storage/ndb/test/ndbapi/testSystemRestart
 storage/ndb/test/ndbapi/testTimeout
 storage/ndb/test/ndbapi/testTransactions
+storage/ndb/test/ndbapi/testUpgrade
 storage/ndb/test/ndbapi/test_event
 storage/ndb/test/ndbapi/test_event_merge
 storage/ndb/test/run-test/atrt
 storage/ndb/test/src/libNDBT.dsp
 storage/ndb/test/tools/copy_tab
 storage/ndb/test/tools/create_index
+storage/ndb/test/tools/eventlog
 storage/ndb/test/tools/hugoCalculator
 storage/ndb/test/tools/hugoFill
 storage/ndb/test/tools/hugoLoad
@@ -2828,6 +2837,7 @@ storage/ndb/test/tools/hugoPkUpdate
 storage/ndb/test/tools/hugoScanRead
 storage/ndb/test/tools/hugoScanUpdate
 storage/ndb/test/tools/listen_event
+storage/ndb/test/tools/ndb_connect
 storage/ndb/test/tools/ndb_cpcc
 storage/ndb/test/tools/rep_latency
 storage/ndb/test/tools/restart

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


--===============1609278068==
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-6.3/
# testament_sha1: 609b4308434b756c3078687b0dfdf51e5778859c
# timestamp: 2010-11-28 13:16:01 +0100
# source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/
# base_revision_id: jonas@stripped
# 
# Begin bundle
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
Lsqk


--===============1609278068==--