bzr push into mysql-5.1-telco-6.3 branch (martin.zaun:3351 to 3352)

[Martin Zaun]

 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
 3351 jonas oreland	2010-11-28
      ndb - bug#58538 - make sure any buffered DML are flushed before sending any reads

    modified:
      sql/ha_ndbcluster.cc
=== 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.", 


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