summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warningsunknown2007-02-23171-2584/+2299
* Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-02-211-0/+1
|\
| * Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-211-0/+1
| |\
| | * Merge trift2.:/MySQL/M50/merge-5.0unknown2007-02-211-0/+1
| | |\
| | | * Merge trift2.:/MySQL/M41/merge-4.1unknown2007-02-201-0/+1
| | | |\
| | | | * After-merge fix:unknown2007-02-201-0/+1
| | | | * Merge trift2.:/MySQL/M40/clone-4.0unknown2007-02-201-1/+0
| | | | |\
| | | | | * include/config-win.h : unknown2007-02-161-1/+1
| | | | | * Fix a linkage problem with the previous patch for "thr_client_alarm".unknown2007-02-122-1/+1
| | | | | * Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c"...unknown2007-02-121-1/+0
| | | | | * Compile error on Windows: Signal names are undefined. Fix by hiding the whole...unknown2007-02-121-0/+3
| | | | | * Fixes a compilation problem on Windows. Backport of theunknown2007-02-091-0/+4
| | | | * | Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-02-1543-135/+493
| | | | |\ \
| | | | * \ \ Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-02-0916-27/+247
| | | | |\ \ \
| | | | * \ \ \ Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-02-071-0/+1
| | | | |\ \ \ \
| | | | | * | | | mysql.spec.sh:unknown2007-01-301-0/+1
* | | | | | | | | Merge poseidon.mysql.com:/home/tomas/mysql-5.0unknown2007-02-210-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-02-2110-6/+225
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-201-0/+9
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-191-3/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-191-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-195-1/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-186-2/+139
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-02-172-7/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-161-6/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-02-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2007-02-161-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-1645-658/+470
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndbunknown2007-02-147-41/+180
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-workunknown2007-02-1431-527/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-02-211-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | archive_reader.c:unknown2007-02-211-0/+1
* | | | | | | | | | | | | | | | | | | | | | Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndbunknown2007-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0unknown2007-02-200-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | / / / / / / | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-02-201-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Raise version number after cloning 5.0.36unknown2007-02-201-2/+2
| | | | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Raise version number after cloning 5.1.16-betaunknown2007-02-201-1/+1
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1...unknown2007-02-218-4/+86
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-02-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Fixed a bad merge. Got a duplicate symbol on OSX.unknown2007-02-201-2/+0
| * | | | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-02-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-164-0/+38
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-1434-86/+686
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-168-4/+86
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-02-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgunknown2007-02-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2007-02-1342-128/+466
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-02-1342-128/+466
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-4.1-optunknown2007-02-131-7/+27
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |