#At file:///home/frazer/bzr/mysql-5.1-telco-6.3/
------------------------------------------------------------
revno: 2623
revision-id: frazer@stripped
parent: monty@stripped
parent: frazer@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.3
timestamp: Tue 2008-06-03 11:34:58 +0100
message:
Merge into 6.3
modified:
mysql-test/suite/ndb/r/ndb_blob.result sp1f-ndb_blob.result-20040719115359-7z65is6skg5xv6upoa7nturemb7h646j
mysql-test/suite/ndb/t/ndb_blob.test sp1f-ndb_blob.test-20040718155656-sxauok4gndxbsg7tjxwjluyoq3adaqjf
storage/ndb/include/kernel/signaldata/KeyInfo.hpp sp1f-keyinfo.hpp-20040414082354-corqbssvvfchibr7542ecatjtikb5wmn
storage/ndb/src/ndbapi/Ndb.cpp sp1f-ndb.cpp-20040414082424-w4iietigjbat2axvr45magbzk4yg6et3
storage/ndb/src/ndbapi/NdbBlob.cpp sp1f-ndbblob.cpp-20040610100200-3kcthg74ev6adshhf5bq6plnsfcotlzh
storage/ndb/src/ndbapi/NdbIndexStat.cpp sp1f-ndbindexstat.cpp-20050915003017-u46kcfhakcw4p5njv633sihzarv7xl4m
storage/ndb/src/ndbapi/NdbOperationDefine.cpp sp1f-ndboperationdefine.c-20040414082425-wyjqzl6mqrnd5ckhjcskztcombchzofq
storage/ndb/src/ndbapi/NdbOperationExec.cpp sp1f-ndboperationexec.cpp-20040414082425-spfhlvqpx5hh2u7nyud2l5ordg7u43eb
storage/ndb/src/ndbapi/NdbOperationInt.cpp sp1f-ndboperationint.cpp-20040414082425-xa76p6frl4mmojhkkqzfmdrvg5dwy5kn
storage/ndb/src/ndbapi/NdbOperationSearch.cpp sp1f-ndboperationsearch.c-20040414082425-2oopaz7wpkfxs4qbozjlx22w7hjvksyz
storage/ndb/src/ndbapi/NdbRecord.hpp sp1f-ndbrecord.hpp-20070514135805-ljqy3uqwmkrmvghkhpco6yw4iniuf7qm
storage/ndb/src/ndbapi/NdbScanOperation.cpp sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
------------------------------------------------------------
revno: 2572.17.3
revision-id: frazer@stripped
parent: monty@stripped
committer: Frazer Clement <frazer@stripped>
branch nick: mysql-5.1-telco-6.2-bugs
timestamp: Tue 2008-06-03 11:00:31 +0100
message:
Bug# 31284 rpl_ndb_blob fails on powermacg5
Long Blob v2 code exercised buffer overrun in old Api setValue() call.
Only detected on PowerMac G5 with Apple compiler.
setValue() buffer overrun fixed.
Various NDBAPI magic numbers de-mystified back to computed constant values
modified:
mysql-test/suite/ndb/r/ndb_blob.result sp1f-ndb_blob.result-20040719115359-7z65is6skg5xv6upoa7nturemb7h646j
mysql-test/suite/ndb/t/ndb_blob.test sp1f-ndb_blob.test-20040718155656-sxauok4gndxbsg7tjxwjluyoq3adaqjf
storage/ndb/include/kernel/signaldata/KeyInfo.hpp sp1f-keyinfo.hpp-20040414082354-corqbssvvfchibr7542ecatjtikb5wmn
storage/ndb/src/ndbapi/Ndb.cpp sp1f-ndb.cpp-20040414082424-w4iietigjbat2axvr45magbzk4yg6et3
storage/ndb/src/ndbapi/NdbBlob.cpp sp1f-ndbblob.cpp-20040610100200-3kcthg74ev6adshhf5bq6plnsfcotlzh
storage/ndb/src/ndbapi/NdbIndexStat.cpp sp1f-ndbindexstat.cpp-20050915003017-u46kcfhakcw4p5njv633sihzarv7xl4m
storage/ndb/src/ndbapi/NdbOperationDefine.cpp sp1f-ndboperationdefine.c-20040414082425-wyjqzl6mqrnd5ckhjcskztcombchzofq
storage/ndb/src/ndbapi/NdbOperationExec.cpp sp1f-ndboperationexec.cpp-20040414082425-spfhlvqpx5hh2u7nyud2l5ordg7u43eb
storage/ndb/src/ndbapi/NdbOperationInt.cpp sp1f-ndboperationint.cpp-20040414082425-xa76p6frl4mmojhkkqzfmdrvg5dwy5kn
storage/ndb/src/ndbapi/NdbOperationSearch.cpp sp1f-ndboperationsearch.c-20040414082425-2oopaz7wpkfxs4qbozjlx22w7hjvksyz
storage/ndb/src/ndbapi/NdbRecord.hpp sp1f-ndbrecord.hpp-20070514135805-ljqy3uqwmkrmvghkhpco6yw4iniuf7qm
storage/ndb/src/ndbapi/NdbScanOperation.cpp sp1f-ndbscanoperation.cpp-20040414082425-yr5memqa2kvjbeg5kez5mhmsjkkzcxmz
------------------------------------------------------------
revno: 2572.17.2
revision-id: monty@stripped
parent: monty@stripped
parent: sp1r-msvensson@pilot.(none)-20080530154602-08389
committer: Monty Taylor <monty@stripped>
branch nick: mysql-5.1-telco-6.2
timestamp: Mon 2008-06-02 09:16:43 +0200
message:
Merged.
added:
mysql-test/include/show_qc_status.inc sp1f-show_qc_status.inc-20080528142621-l2ps6ygwmemtfjcqbpdjfgssrx2vr5s3
mysql-test/suite/ndb/r/ndb_cache_trans.result sp1f-ndb_cache_trans.resu-20080528142622-madqim5pc256y2l7j7yyarhlgwowcukq
mysql-test/suite/ndb/t/ndb_cache_trans.test sp1f-ndb_cache_trans.test-20080528142622-os6oy6wgplgbtjvrbjofyuwzxy62y7zz
modified:
client/mysqltest.c sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
sql/ha_ndbcluster.cc sp1f-ha_ndbcluster.cc-20040414175836-rvqnoxrkqexyhfu3d62s4t345ip7rez2
storage/ndb/src/kernel/blocks/ERROR_codes.txt sp1f-error_codes.txt-20040414082417-mpjvs7oeps7bur4qkcja42xpqqanc7l6
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp sp1f-dbdict.cpp-20040414082418-iodilitk75ncp4kj2matmhrutqp6ztdo
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp sp1f-dbdict.hpp-20040414082418-gwtkbqf7bvvqo4zc4b7taupdvcv5ngby
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp sp1f-dblqh.hpp-20040414082419-6mgkxaewhwzt5iipa75dwwl6antoikoa
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp sp1f-dblqhmain.cpp-20040414082419-5mtvgr6eg47fgddawjjch74crdnaduvi
storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp sp1f-dbtux.hpp-20040414082420-gkdow3inwhzmqmmln4ysglr2mn7kxs62
storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp sp1f-dbtuxdebug.cpp-20040414082420-mcw5nnoj7j3chshylbutxeqstxz6nhxu
storage/ndb/test/ndbapi/testDict.cpp sp1f-testdict.cpp-20040414082437-up57fojv5zipbzkv3mijrxhignscrlpl
------------------------------------------------------------
revno: 2572.11.28
revision-id: sp1r-msvensson@pilot.(none)-20080530154602-08389
parent: sp1r-msvensson@pilot.(none)-20080530153909-08774
committer: msvensson@pilot.(none)
timestamp: Fri 2008-05-30 17:46:02 +0200
message:
Fix spelling error in result file
modified:
mysql-test/suite/ndb/r/ndb_cache_trans.result sp1f-ndb_cache_trans.resu-20080528142622-madqim5pc256y2l7j7yyarhlgwowcukq
------------------------------------------------------------
revno: 2572.11.27
revision-id: sp1r-msvensson@pilot.(none)-20080530153909-08774
parent: sp1r-jonas@stripped
committer: msvensson@pilot.(none)
timestamp: Fri 2008-05-30 17:39:09 +0200
message:
Please compiler by moving variable declaration to beginning of block
modified:
client/mysqltest.c sp1f-mysqltest.c-20001010065317-ix4zw26srlev7yugcz455ux22zwyynyf
Attachment: [text/text/x-diff] patch-2623.diff
| Thread |
|---|
| • bzr commit into mysql-5.1-telco-6.3 tree (frazer:2623) Bug#31284 | Frazer Clement | 3 Jun |
