summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1kent@kent-amd64.(none)2006-12-27147-294/+147
|\
| * Many files:kent@mysql.com/kent-amd64.(none)2006-12-27147-294/+147
* | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2006-12-2621-80/+650
|\ \ | |/ |/|
| * After merge fix.svoj@mysql.com/june.mysql.com2006-12-262-6/+22
| * Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-enginessvoj@june.mysql.com2006-12-261-0/+15
| |\
| | * BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try tosvoj@mysql.com/june.mysql.com2006-12-264-7/+44
| * | Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-211-0/+1
| |\ \ | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-2134-115/+377
| | |\
| * | \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-12-2127-40/+244
| |\ \ \
| * \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-205-7/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2006-12-205-7/+14
| | |\ \ \
| | | * | | Bug#25213 - Compiler warnings in MyISAM codeistruewing@chilla.local2006-12-204-8/+17
| | | * | | Bug#25208 - Warnings in mi_packrec.cistruewing@chilla.local2006-12-201-6/+7
| * | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-190-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2006-12-190-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2006-12-1911-64/+116
| | | |\ \ \
| | * | \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-1913-85/+140
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-12-1916-87/+161
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-enginessvoj@april.(none)2006-12-191-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#23255 - Missing version parameter in plugin declaration examplesvoj@mysql.com/april.(none)2006-12-051-2/+2
| * | | | | | | | | After merge fix.svoj@mysql.com/april.(none)2006-12-131-2/+2
| * | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-enginessvoj@april.(none)2006-12-133-0/+28
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-133-0/+28
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginessvoj@mysql.com/april.(none)2006-12-133-0/+28
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to thesvoj@mysql.com/april.(none)2006-12-073-0/+28
| * | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgistruewing@chilla.local2006-12-080-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2006-12-084-60/+406
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2006-12-044-60/+406
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2006-12-014-60/+406
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-12-011-37/+328
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1-enginesistruewing@chilla.local2006-11-291-37/+328
| | | | | | | |\ \ \ \ \ \ \
| | | | | | * | \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1istruewing@chilla.local2006-11-152-0/+3
| | | | | | |\ \ \ \ \ \ \ \ \
| | * | | | | \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-087-60/+477
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-12-0810-71/+575
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-04114-345/+513
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-12-0410-71/+575
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-axmrgistruewing@chilla.local2006-12-013-0/+71
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0istruewing@chilla.local2006-12-01341-1942/+6045
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-12-014-37/+399
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-11-292-4/+5
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | federated.test:patg@radha.local2006-11-292-4/+5
| | | | | * | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesistruewing@chilla.local2006-11-291-37/+328
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | BUG# 17044 Federated Storage Engine not UTF8 cleanpatg@radha.local2006-11-153-0/+70
| | | * | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1istruewing@chilla.local2006-12-017-71/+504
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2006-12-011-37/+328
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-bug23139istruewing@chilla.local2006-11-291-37/+328
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug23139istruewing@chilla.local2006-11-281-37/+328
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | / / / / / / | | | | | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | Bug#23139 - myisamchk and mysqld crash when trying to access tableistruewing@chilla.local2006-11-281-37/+328