summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mergeunknown2005-01-0453-157/+3551
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-0453-157/+3551
| |\
| | * Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-0353-157/+3551
| | |\
| | | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-032-35/+37
| | | |\
| | | | * Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2005-01-032-26/+37
| | | | |\
| | | | * \ Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2005-01-031-18/+9
| | | | |\ \
| | | * | | | added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignoreunknown2005-01-031-0/+2
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-0314-287/+545
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | mtr_process.pl:unknown2005-01-033-177/+248
| | | | * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-031-36/+190
| | | | |\ \ \
| | | | | * \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-032-1/+2
| | | | | |\ \ \
| | | | | * | | | mysql-test-run.pl:unknown2005-01-021-36/+190
| | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-031-1/+3
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2005-01-033-1/+4
| | | | | |\ \ \ \ \
| | | | | * \ \ \ \ \ Merge mysql.com:/home/wax/mysql/mysql-4.1unknown2005-01-021-1/+3
| | | | | |\ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | | | * | | | | WL#964unknown2005-01-021-1/+3
| | | | * | | | | | | Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0unknown2005-01-030-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-314-55/+55
| | | | | |\ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-033-1/+4
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / | | | | | |/| | | | | | |
| | | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-0210-73/+104
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3110-73/+104
| | | | | |\ \ \ \ \ \ \ \
| | | * | | \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-033-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1unknown2005-01-031-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Fix for bug #7545 (Undefined symbols if --without-geometry)unknown2005-01-031-0/+2
| | | | | |/ / / / / / / /
| | | | * | | | | | | | | set_var.cc:unknown2005-01-022-1/+2
| | | | |/ / / / / / / /
| | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-028-102/+213
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Fixed failed mergeunknown2005-01-011-1/+1
| | | | * | | | | | | | Fixed failed mergeunknown2005-01-011-5/+5
| | | | * | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-013-49/+87
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-011-46/+79
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | mysql-test-run.pl:unknown2005-01-011-46/+79
| | | | | * | | | | | | | | log0recv.c:unknown2005-01-011-2/+1
| | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | row0upd.c:unknown2004-12-311-1/+7
| | | | * | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-313-29/+53
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Merged bugfixunknown2004-12-303-29/+53
| | | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | | - updated compile-dist to include NDB clusterunknown2004-12-311-1/+2
| | | | * | | | | | | | | | Merge mysql.com:/space/my/mysql-4.0unknown2004-12-312-21/+69
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | - Bootrap now uses "compile-dist" by default to create the source distributionunknown2004-12-312-21/+69
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3120-88/+114
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagunknown2004-12-3120-88/+114
| | | * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-311-3/+19
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | - added the "Archive", "CSV" and "Example" storage engines to the Linuxunknown2004-12-311-3/+19
| | | * | | | | | | | | | | | Checking size to no of free + 1 was not correct whenunknown2004-12-311-2/+2
| | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merged fixes for bug #7297 "Two digit year should be interpreted unknown2004-12-308-9/+9
| | | * | | | | | | | | | | Manual merge of fix for bugs of #7297 and #7515 into 4.1 tree.unknown2004-12-305-9/+39
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| / / / / / / / / | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-12-3017-101/+382
| | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix for bug #7515 "from_unixtime(0) now returns NULL instead ofunknown2004-12-304-10/+18
| | | | * | | | | | | | | | Fix for bug #7297 "Two digit year should be interpreted correctlyunknown2004-12-163-1/+23
| | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3014-10/+3011
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-12-3012-3/+3008
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / | | | | | |/| | | | | | | | |
View Lorry Controller Status