summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/gluh/MySQL/Merge/4.1unknown2005-07-213-14/+21
|\
| * Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-213-14/+21
| |\
| | * ctype-latin1.c:unknown2005-07-211-1/+0
| | * Bug#11216: 'show character set' describes latin1 incorrectlyunknown2005-07-213-14/+22
| * | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-212-8/+1
| |\ \
| | * \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-212-8/+1
| | |\ \ | | | |/ | | |/|
| | | * Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-212-8/+1
| | | |\
| | | | * Merge mysql.com:/space/my/mysql-4.1unknown2005-07-212-8/+1
| | | | |\
| * | | | \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-211-3/+1
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-211-1/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-217-76/+123
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-2020-342/+552
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-2020-342/+552
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-211-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-211-1/+1
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix for bug #10839 (myisamchk -rq crashes on spatial field)unknown2005-07-201-1/+1
* | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-212-8/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-212-8/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-07-202-8/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | - Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed...unknown2005-07-202-8/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | - don't install the Mac OS X support files when running "make install" -unknown2005-07-203-14/+2
* | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1unknown2005-07-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | ctype-cp932.c:unknown2005-07-211-3/+1
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-07-211-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-211-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | * | | | | | | | | | | bug#11942 - ndb - backup during DDLunknown2005-07-211-1/+6
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-2124-177/+325
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Fix merge mistakeunknown2005-07-211-1/+1
| * | | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-218-76/+168
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix mergeunknown2005-07-201-16/+2
| | * | | | | | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-07-206-70/+129
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | | * | | | | | | | | Bug #10600 After review fixesunknown2005-07-204-29/+18
| | | * | | | | | | | | Bug #10600unknown2005-07-196-77/+133
| | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-201-0/+2
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Bug #12055 NDB temp tables created by ALTER TABLE are usableunknown2005-07-201-0/+2
| | * | | | | | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-204-4/+49
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | cs fixes from last commit unknown2005-07-201-10/+10
| | | * | | | | | | | | fix for bug#12001unknown2005-07-192-1/+45
| | | * | | | | | | | | minor fix (backport from 5.0) - changed function prototype/definitionunknown2005-07-192-3/+4
| | * | | | | | | | | | Added some missing casts and changed a define for alloca().unknown2005-07-203-5/+6
| * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-07-201-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix date conversion on 32-bit machines.unknown2005-07-201-4/+4
| * | | | | | | | | | | Upgraded the version number, as 5.0.10 is cloned off.unknown2005-07-201-2/+2
| * | | | | | | | | | | Implement MySQL framework to support consistent read views inunknown2005-07-2015-95/+151
| |/ / / / / / / / / /
* | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-07-213-9/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | mergeunknown2005-07-213-9/+10
* | | | | | | | | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2005-07-202-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | mergeunknown2005-07-202-3/+4