summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* comp_err.c: return ha_checksum from checksum_format_specifier() - more corre...tsmith@quadxeon.mysql.com2007-03-081-2/+2
* Merge bk-internal:/home/bk/mysql-5.0-ndbtulin/mysqldev@mysql.com/production.mysql.com2007-03-0813-31/+92
|\
| * Merge poseidon.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.mysql.com2007-03-0813-31/+92
| |\
| | * Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@poseidon.mysql.com2007-03-071-1/+1
| | |\
| | | * ndb -tomas@poseidon.mysql.com2007-03-071-1/+1
| | * | Merge poseidon.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.mysql.com2007-03-0212-30/+91
| | |\ \
| | | * \ Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@poseidon.mysql.com2007-03-028-5/+54
| | | |\ \ | | | | |/
| | | | * Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld...tomas@poseidon.mysql.com2007-03-027-5/+52
| | | | * Bug #26720 Infinite loop on unknown signal in logging functiontomas@poseidon.mysql.com2007-03-021-0/+2
| | | * | Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@poseidon.mysql.com2007-03-012-20/+25
| | | |\ \ | | | | |/
| | | | * ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffertomas@poseidon.mysql.com2007-03-012-20/+25
| | | * | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtomas@poseidon.mysql.com2007-03-012-5/+12
| | | |\ \
| | | | * \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-02-221-4/+7
| | | | |\ \
| | | | | * | ndb - bug#26481 - fix of bug fix 5.0 versionjonas@perch.ndb.mysql.com2007-02-221-4/+7
| | | | * | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2007-02-212-1/+5
| | | | |\ \ \ | | | | | |/ /
| | | | | * | ndb -jonas@perch.ndb.mysql.com2007-02-211-1/+1
| | | | | * | ndb - bug#26515jonas@perch.ndb.mysql.com2007-02-211-0/+4
* | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-mainttsmith@quadxeon.mysql.com2007-03-0816-460/+685
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41tsmith@quadxeon.mysql.com2007-03-080-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40tsmith@quadxeon.mysql.com2007-03-080-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40tsmith@quadxeon.mysql.com2007-03-073-4/+128
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40tsmith@quadxeon.mysql.com2007-03-013-2/+4
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0tsmith@siva.hindu.god2007-02-142-1/+5
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge siva.hindu.god:/home/tsmith/m/bk/40tsmith@siva.hindu.god2007-02-0810-152/+228
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-buildtsmith@quadxeon.mysql.com2007-03-083-9/+140
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildtsmith@quadxeon.mysql.com2007-03-085-33/+160
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-03-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com/kent-amd64.(none)2007-03-073-9/+140
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0kent@mysql.com/kent-amd64.(none)2007-03-07100-700/+4257
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-03-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0kent@mysql.com/kent-amd64.(none)2007-03-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0kent@mysql.com/kent-amd64.(none)2007-03-021-0/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildjoerg@trift2.2007-03-021-6/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M41/manpages-4.1joerg@trift2.2007-03-021-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | Merge trift2.:/MySQL/M40/manpages-4.0joerg@trift2.2007-03-021-0/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Another man page in the RPMs.joerg@trift2.2007-03-021-0/+1
| | | | * | | | | | | | | | | | | | | More man pages for the RPMs.joerg@trift2.2007-03-021-0/+2
| | | * | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M41/manpages-4.1joerg@trift2.2007-03-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | Merge trift2.:/MySQL/M40/manpages-4.0joerg@trift2.2007-03-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | Add missing man pages to the RPMs.joerg@trift2.2007-03-021-0/+9
| | | | | | |_|_|_|_|_|_|/ / / / / / | | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Add the man pages for NDB to the RPMs.joerg@trift2.2007-03-021-5/+19
| | | * | | | | | | | | | | | | | | Add the man pages for NDB to the RPMs.joerg@trift2.2007-03-021-6/+21
| | * | | | | | | | | | | | | | | | mysql.sln:kent@mysql.com/kent-amd64.(none)2007-03-021-4/+4
| | * | | | | | | | | | | | | | | | mysql.sln:kent@mysql.com/kent-amd64.(none)2007-03-011-22/+15
| | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-02-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0kent@mysql.com/kent-amd64.(none)2007-02-281-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-02-281-1/+1
| | * | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2007-02-282-3/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/tmp/mysql-4.0kent@mysql.com/kent-amd64.(none)2007-02-282-3/+117
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-02-282-3/+117
| | | | |/ / / / / / / / / / / /