#At file:///home/frazer/bzr/mysql-5.1-telco-6.4-wl4258/
------------------------------------------------------------
revno: 2665
revision-id: frazer@stripped
parent: frazer@stripped
parent: jonas@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4-wl4258
timestamp: Tue 2008-07-01 16:01:50 +0100
message:
Merge
removed:
storage/ndb/test/include/NdbGrep.hpp sp1f-ndbgrep.hpp-20040414082434-atcdt6r4hgtwxkjy53fzbopkxdwpgrai
storage/ndb/test/run-test/atrt-clear-result.sh sp1f-atrtclearresult.sh-20040414082441-q2ji34qgefi5fkd7h3qsribppspnrjp5
storage/ndb/test/src/NdbGrep.cpp sp1f-ndbgrep.cpp-20040414082441-2j5phukntr4o5d6g5rznsggobdtolk65
added:
mysql-test/suite/ndb/r/ndb_hidden_pk.result ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
mysql-test/suite/ndb/t/ndb_hidden_pk.test ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
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
storage/ndb/test/include/NdbMgmd.hpp ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
storage/ndb/test/ndbapi/testSingleUserMode.cpp testsingleusermode.c-20080623124733-3dpwgj85v5j8gcpw-1
storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1
modified:
BUILD/compile-ndb-autotest sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr
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.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
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/src/ndbapi/NdbEventOperationImpl.cpp sp1f-ndbeventoperationimp-20040414082425-hg5aiqrtvpekpavvqa6cc3kvy2mjllud
storage/ndb/test/include/NDBT_Test.hpp sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
storage/ndb/test/ndbapi/Makefile.am sp1f-makefile.am-20040525095713-tl5yf462jnjwjeu433tiarunzjz3lmzh
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
storage/ndb/test/ndbapi/testMgm.cpp sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
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
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
storage/ndb/test/run-test/daily-devel-tests.txt sp1f-dailydeveltests.txt-20040623115449-iu24viz54gpubbscxtrzjtan6yuff6in
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
storage/ndb/test/run-test/test-tests.txt sp1f-testtests.txt-20070213013848-pnwerxbcymd2vqk2ysdjtkwlqyw2spbr
storage/ndb/test/src/Makefile.am sp1f-makefile.am-20040525095510-ivuwog6r2bygefcdfwjwmco6rgmgeftw
storage/ndb/test/src/NDBT_Test.cpp sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
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: 2663.1.10
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.4
timestamp: Tue 2008-07-01 09:53:42 +0200
message:
merge
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2585.7.13
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.3
timestamp: Mon 2008-06-30 14:31:26 +0200
message:
Fix incorrect printout argument
(that gives warning on 'sapsrv1' autopush)
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2585.7.12
revision-id: jonas@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: jonas@stripped
branch nick: telco-6.3
timestamp: Fri 2008-06-27 10:49:41 +0200
message:
merge
added:
mysql-test/suite/ndb/r/ndb_hidden_pk.result ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
mysql-test/suite/ndb/t/ndb_hidden_pk.test ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2663.1.9
revision-id: jonas@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: jonas@stripped
branch nick: telco-6.4
timestamp: Fri 2008-06-27 10:52:00 +0200
message:
merge
added:
mysql-test/suite/ndb/r/ndb_hidden_pk.result ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
mysql-test/suite/ndb/t/ndb_hidden_pk.test ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2663.2.1
revision-id: frazer@stripped
parent: jonas@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4
timestamp: Thu 2008-06-26 12:07:51 +0100
message:
Merge 6.3 -> 6.4
added:
mysql-test/suite/ndb/r/ndb_hidden_pk.result ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
mysql-test/suite/ndb/t/ndb_hidden_pk.test ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2585.8.2
tags: mysql-5.1.24-ndb-6.3.16
revision-id: frazer@stripped
parent: frazer@stripped
parent: jonas@stripped
committer: Frazer Clement <frazer@stripped>
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: 2585.8.1
revision-id: frazer@stripped
parent: tomas.ulin@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.3
timestamp: Thu 2008-06-26 10:35:14 +0100
message:
Bug#37516 DELETE using UNIQUE index deletes the wrong row
Code for the read-before-write removal optimisation when using
unique indexes did not work correctly when the base table
had no primary key (i.e. hidden primary key).
added:
mysql-test/suite/ndb/r/ndb_hidden_pk.result ndb_hidden_pk.result-20080619120456-kvd0l74zrvp6fl96-1
mysql-test/suite/ndb/t/ndb_hidden_pk.test ndb_hidden_pk.test-20080619120445-10hgl937fdkdln4r-1
modified:
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
------------------------------------------------------------
revno: 2663.1.8
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.4
timestamp: Fri 2008-06-27 10:42:38 +0200
message:
merge
modified:
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2585.7.11
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.3
timestamp: Fri 2008-06-27 10:40:53 +0200
message:
merge
modified:
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2572.19.17
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.2
timestamp: Fri 2008-06-27 10:38:07 +0200
message:
ndb -
increase timeout for testNodeRestart -n Bug34702 T1
modified:
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2663.1.7
revision-id: jonas@stripped
parent: msvensson@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.4
timestamp: Wed 2008-06-25 15:06:41 +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
storage/ndb/test/run-test/conf-fimafeng08.cnf conffimafeng08.cnf-20080624140805-rbdj4pe7kcnjwsi9-1
modified:
BUILD/compile-ndb-autotest sp1f-compilendbautotest-20060621072052-epq5zpjusgpsl2nnt6qmogxenxm6bxrr
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/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
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: 2585.7.10
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.19.16
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.19.15
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: 2585.7.9
revision-id: ndbdev@fimafeng08-20080625101727-qyoonxar10as726p
parent: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg
committer: Local MySQL user <ndbdev@fimafeng08>
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: 2585.7.8
revision-id: ndbdev@fimafeng08-20080624140839-7q6ruym7aptubhrg
parent: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh
committer: Local MySQL user <ndbdev@fimafeng08>
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: 2585.7.7
revision-id: ndbdev@fimafeng08-20080624140454-172apq8go3qwvprh
parent: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n
committer: Local MySQL user <ndbdev@fimafeng08>
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: 2585.7.6
revision-id: ndbdev@fimafeng08-20080624105341-pa34nl2whe9sts4n
parent: tomas.ulin@stripped
committer: Local MySQL user <ndbdev@fimafeng08>
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
------------------------------------------------------------
revno: 2585.7.5
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3
timestamp: Thu 2008-06-19 09:20:55 +0200
message:
merge
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
------------------------------------------------------------
revno: 2572.20.5
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.2
timestamp: Thu 2008-06-19 09:18:42 +0200
message:
correct testcases for previous push
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
------------------------------------------------------------
revno: 2585.7.4
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: jonas@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3
timestamp: Wed 2008-06-18 23:25:50 +0200
message:
merge
modified:
storage/ndb/include/kernel/ndb_limits.h sp1f-ndb_limits.h-20040414082352-7fj33ex7vj432a27xhswhbspi7gsvvmz
storage/ndb/include/ndb_version.h.in sp1f-ndb_version.h.in-20041110204309-x7w2ai7hczf5qqp73k3vch7amzxmle3e
storage/ndb/src/kernel/vm/TransporterCallback.cpp sp1f-transportercallback.-20040414082423-orvgt4lovbdsqu5gjdkhc6oefovmavrk
------------------------------------------------------------
revno: 2585.7.3
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3
timestamp: Wed 2008-06-18 23:22:31 +0200
message:
merge
modified:
storage/ndb/src/kernel/blocks/suma/Suma.cpp sp1f-suma.cpp-20040414082421-p4toipzza63cmyzczerf4mdsbvqbwi5r
storage/ndb/src/kernel/blocks/suma/Suma.hpp sp1f-suma.hpp-20040414082421-mkwzqtqusub3liqrqdouvs6vfgbwvnd5
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp sp1f-sumainit.cpp-20040414082421-iwgc6ajj4j66v2sbecys247q5toloc4i
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2572.20.4
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: jonas@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.2
timestamp: Wed 2008-06-18 23:21:08 +0200
message:
merge
modified:
storage/ndb/src/kernel/blocks/suma/Suma.cpp sp1f-suma.cpp-20040414082421-p4toipzza63cmyzczerf4mdsbvqbwi5r
storage/ndb/src/kernel/blocks/suma/Suma.hpp sp1f-suma.hpp-20040414082421-mkwzqtqusub3liqrqdouvs6vfgbwvnd5
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp sp1f-sumainit.cpp-20040414082421-iwgc6ajj4j66v2sbecys247q5toloc4i
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2585.7.2
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3
timestamp: Wed 2008-06-18 23:19:57 +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:
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.3
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.2
timestamp: Wed 2008-06-18 23:14:40 +0200
message:
reverting wrong commit
modified:
mysql-test/suite/ndb/t/ndb_restore.test sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
------------------------------------------------------------
revno: 2572.20.2
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.2
timestamp: Wed 2008-06-18 17:03:43 +0200
message:
Bug #30452 add a --no-binlog option to ndb_restore
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/ndb/t/ndb_restore.test sp1f-ndb_restore.test-20050124120415-cmxrdjwp26ayjgcbnwb7byz3yrcwg6u4
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: 2585.7.1
revision-id: tomas.ulin@stripped
parent: tomas.ulin@stripped
parent: tomas.ulin@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3
timestamp: Wed 2008-06-18 15:49:43 +0200
message:
automerge
modified:
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
------------------------------------------------------------
revno: 2572.20.1
revision-id: tomas.ulin@stripped
parent: tomas@poseidon-20080616123447-meom2thi0siy20z6
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.2
timestamp: Wed 2008-06-18 14:53:42 +0200
message:
Bug #37472 --log-slave-updates=0 will result in some data in the binlog
- if no rows in the transaction against the binlog, rollback, instead of commit
modified:
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
------------------------------------------------------------
revno: 2663.1.6
revision-id: msvensson@stripped
parent: msvensson@stripped
committer: Magnus Svensson <msvensson@stripped>
branch nick: 5.1-telco-6.4
timestamp: Mon 2008-06-23 18:14:43 +0200
message:
Remove atrt-clear-result.sh and replace it with a call to 'remove_dir'
Improve error messages with better instructions what action do perform to resolve
the problem
If atrt enters interactive mode, first print a message about this and
then print a small prompt saying "atrt> " when atrt is waiting for input
removed:
storage/ndb/test/run-test/atrt-clear-result.sh sp1f-atrtclearresult.sh-20040414082441-q2ji34qgefi5fkd7h3qsribppspnrjp5
modified:
storage/ndb/test/run-test/Makefile.am sp1f-makefile.am-20040526111411-l4ppdj636zpq7aeuphj2i5kst5izlawe
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2663.1.5
revision-id: msvensson@stripped
parent: msvensson@stripped
committer: Magnus Svensson <msvensson@stripped>
branch nick: t4-atrt-from-clone
timestamp: Mon 2008-06-23 15:55:42 +0200
message:
Improve error message when failing to find config file to use
modified:
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2663.1.4
revision-id: msvensson@stripped
parent: msvensson@stripped
committer: Magnus Svensson <msvensson@stripped>
branch nick: t4-NDBT
timestamp: Mon 2008-06-23 14:52:49 +0200
message:
Move tests for single user mode to "testSingleUserMode"
added:
storage/ndb/test/ndbapi/testSingleUserMode.cpp testsingleusermode.c-20080623124733-3dpwgj85v5j8gcpw-1
modified:
storage/ndb/test/ndbapi/Makefile.am sp1f-makefile.am-20040525095713-tl5yf462jnjwjeu433tiarunzjz3lmzh
storage/ndb/test/ndbapi/testMgm.cpp sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
storage/ndb/test/run-test/daily-devel-tests.txt sp1f-dailydeveltests.txt-20040623115449-iu24viz54gpubbscxtrzjtan6yuff6in
storage/ndb/test/run-test/test-tests.txt sp1f-testtests.txt-20070213013848-pnwerxbcymd2vqk2ysdjtkwlqyw2spbr
------------------------------------------------------------
revno: 2663.1.3
revision-id: msvensson@stripped
parent: msvensson@stripped
committer: Magnus Svensson <msvensson@stripped>
branch nick: t4-NDBT
timestamp: Mon 2008-06-23 14:38:11 +0200
message:
Remove NdbGrep.[hc]pp, obsolete file used to test Grep which does not exist anymore
removed:
storage/ndb/test/include/NdbGrep.hpp sp1f-ndbgrep.hpp-20040414082434-atcdt6r4hgtwxkjy53fzbopkxdwpgrai
storage/ndb/test/src/NdbGrep.cpp sp1f-ndbgrep.cpp-20040414082441-2j5phukntr4o5d6g5rznsggobdtolk65
modified:
storage/ndb/test/src/Makefile.am sp1f-makefile.am-20040525095510-ivuwog6r2bygefcdfwjwmco6rgmgeftw
------------------------------------------------------------
revno: 2663.1.2
revision-id: msvensson@stripped
parent: jonas@stripped
committer: Magnus Svensson <msvensson@stripped>
branch nick: t4-NDBT
timestamp: Mon 2008-06-23 14:37:22 +0200
message:
Remove "remote mgm" - it's just NDB_CONNECTSTRTING
added:
storage/ndb/test/include/NdbMgmd.hpp ndbmgmd.hpp-20080623123318-i58qss0o81tc2mlb-1
modified:
storage/ndb/test/include/NDBT_Test.hpp sp1f-ndbt_test.hpp-20040414082433-xwtu4ad3l6jejmpxybvuza32wyp2eg7l
storage/ndb/test/ndbapi/testMgm.cpp sp1f-testmgm.cpp-20040414082437-aou3ln5hvawx3rszj6qvam7oixyoticz
storage/ndb/test/src/NDBT_Test.cpp sp1f-ndbt_test.cpp-20040414082441-artfvezrpus5ncexgq2vu7ei4btyio4f
------------------------------------------------------------
revno: 2663.1.1
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.4
timestamp: Wed 2008-06-18 17:15:22 +0200
message:
merge
modified:
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2585.6.8
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.3
timestamp: Wed 2008-06-18 17:10:41 +0200
message:
merge
modified:
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
------------------------------------------------------------
revno: 2572.19.14
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.2
timestamp: Wed 2008-06-18 17:05:56 +0200
message:
ndb - fix merge error
in test_event -n Bug31701
modified:
storage/ndb/test/ndbapi/test_event.cpp sp1f-test_event.cpp-20040414082438-mn2bippetrmdotxdqygnmo7y2fhcioia
------------------------------------------------------------
revno: 2572.19.13
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.2
timestamp: Wed 2008-06-18 16:55:21 +0200
message:
ndb -
fix strict aliasing bug in testInterpreter
modified:
storage/ndb/test/ndbapi/testInterpreter.cpp sp1f-testinterpreter.cpp-20040414082437-uys4lv75hhtotdamd3z2k4dx3od6dlgr
------------------------------------------------------------
revno: 2572.19.12
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.2
timestamp: Wed 2008-06-18 16:50:56 +0200
message:
ndb -
fix incorrect dependancy for a testcase
that required 2 node groups
modified:
storage/ndb/test/ndbapi/testSystemRestart.cpp sp1f-testsystemrestart.cp-20040414082438-t5ula3y3jcg3cs6hqyti5pdnhkhtglha
------------------------------------------------------------
revno: 2572.19.11
revision-id: jonas@stripped
parent: jonas@stripped
committer: jonas@stripped
branch nick: telco-6.2
timestamp: Wed 2008-06-18 16:47:19 +0200
message:
ndb -
remve deprecated test from autotest
modified:
storage/ndb/test/run-test/daily-basic-tests.txt sp1f-dailybasictests.txt-20040623115449-liur6p3tedydxdte6rr35pqap26frov6
Attachment: [text/text/x-diff] patch-2665.diff
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.4 tree (frazer:2665) Bug#31701, Bug#34702,Bug#37516, Bug#37628, WL#4258 | Frazer Clement | 1 Jul |
