#At file:///home/frazer/bzr/mysql-5.1-telco-6.4-wl4258/
------------------------------------------------------------
revno: 2734
revision-id: frazer@stripped
parent: frazer@stripped
parent: martin.skold@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.4-wl4258
timestamp: Wed 2008-08-27 15:15:01 +0100
message:
Merge
modified:
mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
storage/ndb/include/kernel/signaldata/DictSignal.hpp sp1f-dictsignal.hpp-20071225160431-blp6kgahcicegkreejcc34vafunsak2l
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
storage/ndb/src/common/transporter/TCP_Transporter.cpp sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
storage/ndb/src/kernel/blocks/LocalProxy.cpp localproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-1
storage/ndb/src/kernel/blocks/LocalProxy.hpp localproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-2
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp sp1f-dbtup.hpp-20040414082419-idobqlb5css6uzs7wsmex3judi7tw5e5
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp dbtupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-11
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp dbtupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-12
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp sp1f-dbtuptrigger.cpp-20040414082420-bi34k4njclrc2iwhhjhmbzm6h7tnt33r
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp sp1f-dbtuxgen.cpp-20040414082420-vnbbipvn5hjzx66u4qvhmdnqn6wesb7t
storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp dbtuxproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-13
storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp dbtuxproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-14
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp sp1f-dbtuxscan.cpp-20040414082420-tkntsolfyc5m76m4f5vsmkdqcgizadnu
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/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
storage/ndb/test/run-test/atrt.hpp sp1f-runtest.hpp-20040414082441-fridwlerv6qlfqiujxkktzfrjttsb4n5
storage/ndb/test/run-test/db.cpp sp1f-db.cpp-20070924140155-udtp2m6ywjoqt6kkqjsbyqvgscihvdhx
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2732.1.8
revision-id: martin.skold@stripped
parent: jonas@stripped
committer: Martin Skold <Martin.Skold@stripped>
branch nick: mysql-5.1-telco-6.4_work
timestamp: Wed 2008-08-27 14:32:38 +0200
message:
WL#4331 Ensuring resilience against master node failures (Ndb): Add node id to schema trans op_key to make them globally unique
modified:
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
------------------------------------------------------------
revno: 2732.1.7
revision-id: jonas@stripped
parent: pekka@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.4
timestamp: Wed 2008-08-27 13:45:57 +0200
message:
merge 6.3 to 6.4
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
storage/ndb/test/run-test/atrt.hpp sp1f-runtest.hpp-20040414082441-fridwlerv6qlfqiujxkktzfrjttsb4n5
storage/ndb/test/run-test/db.cpp sp1f-db.cpp-20070924140155-udtp2m6ywjoqt6kkqjsbyqvgscihvdhx
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2585.11.25
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.3
timestamp: Wed 2008-08-27 13:44:54 +0200
message:
merge 6.2 to 6.3
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
storage/ndb/test/run-test/atrt.hpp sp1f-runtest.hpp-20040414082441-fridwlerv6qlfqiujxkktzfrjttsb4n5
storage/ndb/test/run-test/db.cpp sp1f-db.cpp-20070924140155-udtp2m6ywjoqt6kkqjsbyqvgscihvdhx
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2572.21.35
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.2
timestamp: Wed 2008-08-27 13:42:30 +0200
message:
ndb - atrt -
save logs if servers fails to start
to help track problem found trondheim
modified:
storage/ndb/test/run-test/atrt.hpp sp1f-runtest.hpp-20040414082441-fridwlerv6qlfqiujxkktzfrjttsb4n5
storage/ndb/test/run-test/db.cpp sp1f-db.cpp-20070924140155-udtp2m6ywjoqt6kkqjsbyqvgscihvdhx
storage/ndb/test/run-test/main.cpp sp1f-main.cpp-20040414082441-zazhzwh42vmmnjuvtjl7tigwox3ffn54
------------------------------------------------------------
revno: 2572.21.34
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.2
timestamp: Wed 2008-08-27 08:45:13 +0200
message:
ndb - atrt - bt, source env
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2732.1.6
revision-id: pekka@stripped
parent: pekka@stripped
committer: Pekka Nousiainen <pekka@stripped>
branch nick: my51-wl4391
timestamp: Wed 2008-08-27 11:00:52 +0300
message:
wl#4391 19.diff
SUMA (subscription triggers).
modified:
storage/ndb/src/kernel/blocks/LocalProxy.cpp localproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-1
storage/ndb/src/kernel/blocks/LocalProxy.hpp localproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-2
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp sp1f-dbtup.hpp-20040414082419-idobqlb5css6uzs7wsmex3judi7tw5e5
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp sp1f-dbtuptrigger.cpp-20040414082420-bi34k4njclrc2iwhhjhmbzm6h7tnt33r
storage/ndb/src/kernel/blocks/suma/Suma.cpp sp1f-suma.cpp-20040414082421-p4toipzza63cmyzczerf4mdsbvqbwi5r
------------------------------------------------------------
revno: 2732.1.5
revision-id: pekka@stripped
parent: jonas@stripped
committer: Pekka Nousiainen <pekka@stripped>
branch nick: my51-wl4391
timestamp: Wed 2008-08-27 10:54:42 +0300
message:
wl#4391 18.diff
Indexes (triggers and build).
modified:
storage/ndb/src/kernel/blocks/LocalProxy.cpp localproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-1
storage/ndb/src/kernel/blocks/LocalProxy.hpp localproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-2
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp dbtupproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-11
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp dbtupproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-12
storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp sp1f-dbtuxgen.cpp-20040414082420-vnbbipvn5hjzx66u4qvhmdnqn6wesb7t
storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp dbtuxproxy.cpp-20080725170101-pvhz0ak4ktf6qd1f-13
storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp dbtuxproxy.hpp-20080725170101-pvhz0ak4ktf6qd1f-14
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp sp1f-dbtuxscan.cpp-20040414082420-tkntsolfyc5m76m4f5vsmkdqcgizadnu
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
------------------------------------------------------------
revno: 2732.1.4
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.4
timestamp: Tue 2008-08-26 12:11:03 +0200
message:
merge 6.3 to 6.4
modified:
mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
------------------------------------------------------------
revno: 2585.11.24
revision-id: jonas@stripped
parent: jonas@stripped
parent: tomas.ulin@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.3
timestamp: Tue 2008-08-26 12:10:22 +0200
message:
merge
modified:
mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
------------------------------------------------------------
revno: 2585.13.1
revision-id: tomas.ulin@stripped
parent: jonas@stripped
committer: Tomas Ulin <tomas.ulin@stripped>
branch nick: cge-6.3-issue-27036
timestamp: Tue 2008-08-26 12:05:18 +0200
message:
bug#39026
modified:
mysql-test/mysql-test-run.pl sp1f-mysqltestrun.pl-20041230152716-xjnn5ndv4rr4by6ijmj5a4ysubxc7qh3
------------------------------------------------------------
revno: 2732.1.3
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.4
timestamp: Tue 2008-08-26 12:09:35 +0200
message:
merge 6.3 to 6.4
modified:
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
storage/ndb/src/common/transporter/TCP_Transporter.cpp sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2585.11.23
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.3
timestamp: Tue 2008-08-26 12:08:29 +0200
message:
merge 6.2 to 6.3
modified:
storage/ndb/src/common/transporter/TCP_Transporter.cpp sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2572.21.33
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.2
timestamp: Tue 2008-08-26 12:03:43 +0200
message:
ndb - bug#39038 - compile error on HP-UX
modified:
storage/ndb/src/common/transporter/TCP_Transporter.cpp sp1f-tcp_transporter.cpp-20040414082412-dt2akzuysvsvrqj52hh2yt5dvgkgnpui
------------------------------------------------------------
revno: 2572.21.32
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.2
timestamp: Mon 2008-08-25 09:57:58 +0200
message:
ndb - atrt bt - more typos / printouts
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2585.11.22
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.3
timestamp: Tue 2008-08-26 12:07:22 +0200
message:
ndb - bug#39036 - compile error with forte
modified:
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp sp1f-ndbindexscanoperatio-20040526093855-tiiep5fhck6uukkvxquaq5jtbzjcssp2
------------------------------------------------------------
revno: 2732.1.2
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.4
timestamp: Tue 2008-08-26 12:07:49 +0200
message:
ndb - fix compile error on solaris
modified:
storage/ndb/include/kernel/signaldata/DictSignal.hpp sp1f-dictsignal.hpp-20071225160431-blp6kgahcicegkreejcc34vafunsak2l
------------------------------------------------------------
revno: 2732.1.1
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.4
timestamp: Sun 2008-08-24 23:50:04 +0200
message:
merge 6.3 to 6.4
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2585.11.21
revision-id: jonas@stripped
parent: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.3
timestamp: Sun 2008-08-24 23:49:34 +0200
message:
merge 6.2 to 6.3
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
------------------------------------------------------------
revno: 2572.21.31
revision-id: jonas@stripped
parent: jonas@stripped
committer: Jonas Oreland <jonas@stripped>
branch nick: telco-6.2
timestamp: Sun 2008-08-24 23:49:05 +0200
message:
ndb - atrt bt - more typos
modified:
storage/ndb/test/run-test/atrt-backtrace.sh atrtbacktrace.sh-20080823202807-vu5lnmgb0m440szd-1
Attachment: [text/text/x-diff] patch-2734.diff
| Thread |
|---|
| • bzr commit into mysql-5.1 tree (frazer:2734) Bug#39026, Bug#39036, Bug#39038,WL#4258, WL#4331, WL#4391 | Frazer Clement | 27 Aug |
