summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-4.1-10407unknown2005-07-226-16/+38
|\
| * Fix error message generated when trying to create a table in aunknown2005-07-216-16/+38
* | Fix calculation for length of LPAD() and RPAD() reported tounknown2005-07-223-2/+26
* | ctype-gbk.c:unknown2005-07-225-1/+205
* | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-223-8/+70
|\ \
| * \ Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-223-8/+70
| |\ \
| | * | ctype_utf8.result, ctype_utf8.test:unknown2005-07-193-8/+70
* | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-221-1/+1
|\ \ \ \ | |/ / /
| * | | mergingunknown2005-07-221-1/+1
| |\ \ \
| | * \ \ Merge bk@192.168.21.1:/usr/home/bk/mysql-4.0unknown2005-07-221-2/+2
| | |\ \ \
| | | * | | Fix for bug #12042 (User breakpoints calling free() in embedded library)unknown2005-07-211-2/+2
| | * | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-07-213-14/+2
| | |\ \ \ \
* | | \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-191-0/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.0/mainunknown2005-07-141-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | BUG#11384 drop database causes mysqld to coreunknown2005-07-141-0/+1
* | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ - 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-4.1unknown2005-07-211-3/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | ctype-cp932.c:unknown2005-07-211-3/+1
| |/ / / / / / / /
* | | | | | | | | 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-4.1unknown2005-07-217-76/+123
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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 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
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | bug#11942 - ndb backupunknown2005-07-203-4/+4
| | * | | | | | | bug#11942 - ndb backup with parallell DDLunknown2005-07-202-1/+5
| | * | | | | | | bug#11942unknown2005-07-2012-109/+342
| | * | | | | | | ndb -unknown2005-07-042-4/+14
| | * | | | | | | bug#11133 - ndb write handlingunknown2005-07-014-226/+189
| | * | | | | | | ndb autotest - merge jebs fixesunknown2005-06-301-3/+3
* | | | | | | | | 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 abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-20116-760/+2126
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |