From: Martin Zaun
Date: November 28 2010 11:02am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3351)
List-Archive: http://lists.mysql.com/commits/125252
Message-Id: <201011281103.oAS74Lf5010904@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2035744711=="

--===============2035744711==
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-duplicate-symbols-fix/ based on revid:martin.zaun@stripped

 3351 Martin Zaun	2010-11-28
      ndb - extended .bzrignore for a few ndb-test artefacts.

    modified:
      .bzrignore
=== 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


--===============2035744711==
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-duplicate-symbols-fix/
# testament_sha1: 3bb13bf03a2fce53e4562c301ab6fdbcb8062ba5
# timestamp: 2010-11-28 12:02:36 +0100
# base_revision_id: martin.zaun@stripped\
#   tufn7fmht37vuptj
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaIhDx0AAdJfgEAQUGP/91cD
HhC////wUAQOvePKJu0atOtsJSEnqelP1J4o9ojaQj0ajTTCaDEMgSSII2EyE0m1R6TT1AAYhoDI
JIQmhMmQEyaEDQ9T1NABppoGp6kCeo0aeoDIGmjQyAxA0xMJJCaZTKn7SJPaU3o1NoU9E0GCMQZJ
Z6+Xbdz57NzMPH3eZLHpTJQiJjattBZIty1taySzZKxE273+7RJQB7oQBkZubQ8whZwlkhZSXoki
6VLaSwoOiC/4UxPnrVV0lWh3RdCchqRakNDFUNOYhbXxVpfW7AcokwtdtmlQyanR61iKXJFWT32V
QYRCgDydohwPI4nKLlqZBr7HahAo1RU7UxQ1QIghCZhb7Z8mInNVI22KSopnULKs78J44ltHEY4b
rsWQfDFyoqLeZ675Cog0zpoqgupdXa75hZ4HjdXCyj7ekzupe2Kjx551xVTKZDohNONmzxTtK6jC
cwXoGSbpk4ItUgXPw00wcJ8m5M26y1jxNJXHmWpftgZ+tUh2nklsqdewZpDI4D4E/IsE1C7RoK0a
Y155FH1Ycpcwo81KVUX0Kqdg8yGtxoXz2jy5Ejx2v66jyq03J2Gmi91mJQ4ZfXeRWLKEFH2KV6uj
DLOVqE5lvZ4xlc6BtYXdNLd2Mh2Ywywd1E5C4YzHzpyFrOLatLRwwrpvgjc0xaHM6UkmsahUK0bm
YbNLW79q3fTviQilrJj7/j9yn7tFzcW9/J8vaTrK1HPpA9lBdkw7uFSB8ve7tEcWi5wi1gpSnCF1
BFLEX/vEE8aTe14hC1BM1PiQ0GNpwEUIXGhxronzvPU0ogtLdT8T+md/9ZGPW+xxD4JGMivgxRi/
T6XtvUl6x4WToXeyQ6+L5FVjphPrvmxXh5LRDkIZalebIj8t0Mz1Le4PXE/JcX7OthCS+26FaviS
EslPkrPzWNtPgFJQyiK77rrXZ2oiKbukDwwJtbBJ1FpCwlOG8wq84kthMdvefutmq5NiWb6lzgNH
t4JKNQrAy5nAx5m8Ga3z6lqETA3m1xm1qonp2op140YY4p1aaYrBO4KOmaDKgyBMV8SbBVyOwVyx
WAR3C9dwPCbgtz2zEMZZ9Gd1ajok8R4izfcHM+Yz8OpWYyvN6ze6bEy2/zpk1GSGtTQIk7LY+IaC
GhCNfIlGvi82hbWKLJl1j9WGeqZsEpBycdJInrEPErwetr1PZuV+vBmUCbEffAR0wa+I5cTaWU4Y
OThHUwlwYLEVjzyPSb+yBgYLfZpsrYFUFBXYyYb4vro0XGjxxB3jNdnHNtlggwEXo1GHaa8rOTiI
M1iYiiQT6Dw/c22y/MS4krN9aDAqKO4iJOX4atzlxUlTFeo6C7KJFsetXawWfyeERydl1xKLgVBp
QSfW3w6hFZlCV+Z/xdyRThQkKIhDx0A=


--===============2035744711==--