From: Date: June 26 2008 12:46pm Subject: bzr commit into mysql-5.1-telco-6.3 tree (frazer:2633) Bug#37628 List-Archive: http://lists.mysql.com/commits/48560 X-Bug: 37628 Message-Id: <200806261046.m5QAkOmn031546@forth.ndb.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1013293625==" --===============1013293625== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/frazer/bzr/mysql-5.1-telco-6.3/ ------------------------------------------------------------ revno: 2633 revision-id: frazer@stripped parent: frazer@stripped parent: jonas@stripped committer: Frazer Clement branch nick: mysql-5.1-telco-6.3 timestamp: Thu 2008-06-26 11:46:06 +0100 message: Merge added: storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1 modified: BUILD/compile-ndb-autotest sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud storage/ndb/test/run-test/Makefile.am sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe storage/ndb/test/run-test/autotest-boot.sh sp1f-autotestboot.sh-20070213013847-6htzi6tpzsvgdiips4ks6htfchtbzxlf storage/ndb/test/run-test/autotest-run.sh sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk ------------------------------------------------------------ revno: 2631.1.5 revision-id: jonas@stripped parent: ndbdev@fimafeng08-20080625101727-qyoonxar10as726p parent: jonas@stripped committer: jonas@stripped branch nick: telco-6.3 timestamp: Wed 2008-06-25 15:00:44 +0200 message: merge modified: storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud ------------------------------------------------------------ revno: 2572.20.7 revision-id: jonas@stripped parent: jonas@stripped parent: tomas.ulin@stripped committer: jonas@stripped branch nick: telco-6.2 timestamp: Wed 2008-06-25 14:53:12 +0200 message: merge added: mysql-test/suite/ndb_binlog/r/ndb_binlog_restore.result ndb_binlog_restore.r-20080618145859-emr3sbe7769wo96b-1 mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test ndb_binlog_restore.t-20080618145852-pjxv318v5mr6381h-1 modified: mysql-test/suite/binlog/r/binlog_multi_engine.result sp1f-binlog_multi_engine.-20070528105025-fenxgj26mp5ianhpil75kfyagrm47t66 mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result sp1f-ndb_binlog_format.re-20070627203253-x3ttcvabztiziy2mz6jclr6jluscl35w mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result sp1f-ndb_binlog_log_bin.r-20070418193943-qsp24qu35irny5fy43kqolit3jvmp2ew sql/ha_ndbcluster_binlog.cc sp1f-ha_ndbcluster_binlog-20060112185048-3hthowbxyrrly3srxavlrufjf5mmgqm6 sql/rpl_injector.cc sp1f-rpl_injector.cc-20060112185049-nmh4krszzy7lfqbhbaznaczvq36kmykc sql/rpl_injector.h sp1f-rpl_injector.h-20060112185050-huutlwyo3jmlfj6bkxrzdg3oa4gjjuth storage/ndb/tools/restore/consumer_restore.cpp sp1f-consumer_restore.cpp-20040609192428-bzxldffntdpxflj7pqxgnvugxrjnrjzy storage/ndb/tools/restore/restore_main.cpp sp1f-main.cpp-20040414082418-axtjww22xvsugxaltjnpxdoyy2xk2dyg ------------------------------------------------------------ revno: 2572.20.6 revision-id: jonas@stripped parent: jonas@stripped committer: jonas@stripped branch nick: telco-6.2 timestamp: Wed 2008-06-25 14:49:13 +0200 message: ndb - bug#37628 Fix variable scoping (remove duplicate variable start_gci) in complete_out_of_order_buckets also correct a printout in same function modified: storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud ------------------------------------------------------------ revno: 2631.1.4 revision-id: ndbdev@fimafeng08-20080625101727-qyoonxar10as726p parent: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg committer: Local MySQL user branch nick: mysql-5.1-telco-6.3 timestamp: Wed 2008-06-25 12:17:27 +0200 message: add config file for trondheim host also to Makefile modified: storage/ndb/test/run-test/Makefile.am sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe ------------------------------------------------------------ revno: 2631.1.3 revision-id: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg parent: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh committer: Local MySQL user branch nick: mysql-5.1-telco-6.3 timestamp: Tue 2008-06-24 16:08:39 +0200 message: add config file for trondheim host added: storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1 modified: storage/ndb/test/run-test/autotest-boot.sh sp1f-autotestboot.sh-20070213013847-6htzi6tpzsvgdiips4ks6htfchtbzxlf ------------------------------------------------------------ revno: 2631.1.2 revision-id: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh parent: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n committer: Local MySQL user branch nick: mysql-5.1-telco-6.3 timestamp: Tue 2008-06-24 16:04:54 +0200 message: fix usage of hostname for solaris modified: storage/ndb/test/run-test/autotest-boot.sh sp1f-autotestboot.sh-20070213013847-6htzi6tpzsvgdiips4ks6htfchtbzxlf storage/ndb/test/run-test/autotest-run.sh sp1f-autotestrun.sh-20070213013847-a5cyfgilhltmal6tvleacwnanazbb3wk ------------------------------------------------------------ revno: 2631.1.1 revision-id: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n parent: tomas.ulin@stripped committer: Local MySQL user branch nick: mysql-5.1-telco-6.3 timestamp: Tue 2008-06-24 12:53:41 +0200 message: add hook for os-specific configure options for autotest modified: BUILD/compile-ndb-autotest sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr --===============1013293625== MIME-Version: 1.0 Content-Type: text/text/x-diff; charset="us-ascii"; name="patch-2633.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline === modified file 'BUILD/compile-ndb-autotest' --- a/BUILD/compile-ndb-autotest 2006-08-02 07:08:21 +0000 +++ b/BUILD/compile-ndb-autotest 2008-06-24 10:53:41 +0000 @@ -15,5 +15,6 @@ fi extra_flags="$extra_flags $max_cflags -g" +extra_configs="$extra_configs $NDB_AUTOTEST_CONFIGURE_OPTIONS" . "$path/FINISH.sh" === modified file 'storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp' --- a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2008-06-16 14:31:26 +0000 +++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2008-06-25 13:00:44 +0000 @@ -1957,14 +1957,14 @@ Uint64 stop_gci = m_latest_complete_GCI; Uint64 start_gci = array[minpos]; - g_eventLogger->info("complete_outof_order_gcis from: %u/%u to: %u/%u", - Uint32(start_gci >> 32), Uint32(start_gci), - Uint32(stop_gci >> 32), Uint32(stop_gci)); + g_eventLogger->info("complete_outof_order_gcis from: %u/%u(%u) to: %u/%u(%u)", + Uint32(start_gci >> 32), Uint32(start_gci), minpos, + Uint32(stop_gci >> 32), Uint32(stop_gci), maxpos); assert(start_gci <= stop_gci); do { - Uint64 start_gci = array[minpos]; + start_gci = array[minpos]; Gci_container* bucket = find_bucket(start_gci); assert(bucket); assert(maxpos == m_max_gci_index); @@ -1978,10 +1978,10 @@ #ifdef VM_TRACE ndbout_c("complete_outof_order_gcis - completing %u/%u rows: %u", - Uint32(start_gci), Uint32(start_gci), bucket->m_data.m_count); + Uint32(start_gci >> 32), Uint32(start_gci), bucket->m_data.m_count); #else ndbout_c("complete_outof_order_gcis - completing %u/%u", - Uint32(start_gci), Uint32(start_gci)); + Uint32(start_gci >> 32), Uint32(start_gci)); #endif complete_bucket(bucket); === modified file 'storage/ndb/test/run-test/Makefile.am' --- a/storage/ndb/test/run-test/Makefile.am 2008-04-25 06:32:23 +0000 +++ b/storage/ndb/test/run-test/Makefile.am 2008-06-25 10:17:27 +0000 @@ -23,7 +23,8 @@ test_PROGRAMS = atrt test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \ conf-ndbmaster.cnf \ - conf-dl145a.cnf test-tests.txt conf-test.cnf db.sql + conf-fimafeng08.cnf conf-dl145a.cnf test-tests.txt conf-test.cnf db.sql +# conf-dl145a.cnf test-tests.txt conf-test.cnf db.sql test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ atrt-clear-result.sh autotest-run.sh === modified file 'storage/ndb/test/run-test/autotest-boot.sh' --- a/storage/ndb/test/run-test/autotest-boot.sh 2008-06-08 05:21:05 +0000 +++ b/storage/ndb/test/run-test/autotest-boot.sh 2008-06-24 14:08:39 +0000 @@ -13,7 +13,12 @@ VERSION="autotest-boot.sh version 1.00" DATE=`date '+%Y-%m-%d'` -HOST=`hostname -s` +if [ `uname -s` != "SunOS" ] +then + HOST=`hostname -s` +else + HOST=`hostname` +fi export DATE HOST set -e === modified file 'storage/ndb/test/run-test/autotest-run.sh' --- a/storage/ndb/test/run-test/autotest-run.sh 2007-08-31 14:55:59 +0000 +++ b/storage/ndb/test/run-test/autotest-run.sh 2008-06-24 14:04:54 +0000 @@ -13,7 +13,12 @@ VERSION="autotest-run.sh version 1.00" DATE=`date '+%Y-%m-%d'` -HOST=`hostname -s` +if [ `uname -s` != "SunOS" ] +then + HOST=`hostname -s` +else + HOST=`hostname` +fi export DATE HOST set -e === added file 'storage/ndb/test/run-test/conf-fimafeng08.cnf' --- a/storage/ndb/test/run-test/conf-fimafeng08.cnf 1970-01-01 00:00:00 +0000 +++ b/storage/ndb/test/run-test/conf-fimafeng08.cnf 2008-06-24 14:08:39 +0000 @@ -0,0 +1,28 @@ +[atrt] +basedir = CHOOSE_dir +baseport = 14000 +clusters = .2node + +[ndb_mgmd] + +[mysqld] +skip-innodb +skip-bdb + +[cluster_config.2node] +ndb_mgmd = CHOOSE_host1 +ndbd = CHOOSE_host2,CHOOSE_host3 +ndbapi= CHOOSE_host1,CHOOSE_host1,CHOOSE_host1 + +NoOfReplicas = 2 +IndexMemory = 100M +DataMemory = 300M +BackupMemory = 64M +MaxNoOfConcurrentScans = 100 +MaxNoOfSavedMessages= 1000 +SendBufferMemory = 2M +NoOfFragmentLogFiles = 4 +FragmentLogFileSize = 64M +CompressedLCP=1 +CompressedBackup=1 +ODirect=1 --===============1013293625==--