summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-2744-88/+44
|\
| * Many files:unknown2006-12-2744-88/+44
* | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2006-12-264-19/+22
|\ \ | |/ |/|
| * After merge fix.unknown2006-12-261-5/+10
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-214-24/+32
| |\
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-194-55/+83
| |\ \
| * \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-enginesunknown2006-12-131-0/+2
| |\ \ \
| | * \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-enginesunknown2006-12-131-0/+2
| | |\ \ \
| | | * \ \ Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-enginesunknown2006-12-131-0/+2
| | | |\ \ \
| | | | * | | BUG#23404 - ROW_FORMAT=FIXED option is lost is an index is added to theunknown2006-12-071-0/+2
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-12-081-3/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-12-011-3/+0
| | | | |\ \ \
| | | | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-131-3/+0
| | | | | |\ \ \
| | | * | | \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836unknown2006-12-051-8/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836unknown2006-12-042-28/+23
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-12-044-18/+9
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |
| | | * | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-12-041-6/+67
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maintunknown2006-12-011-6/+67
| | | | |\ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-11-286-23/+79
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2006-11-248-36/+125
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-082-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-0442-190/+202
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-0165-614/+2069
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-12-011-0/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | BUG# 17044 Federated Storage Engine not UTF8 cleanunknown2006-11-151-0/+11
| | | * | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-101-3/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-082-14/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-042-14/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-012-14/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-1532-1867/+2201
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-122-14/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-5.0-enginesunknown2006-11-071-3/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG23312/mysql-4.1-enginesunknown2006-11-071-3/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | | | | | | |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-enginesunknown2006-11-071-3/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | BUG#23312 - server hangs 'closing tables' with insert delayed,flushunknown2006-11-021-3/+0
| | | | | * | | | | | | | | | | | | | | | | | | Bug#22694unknown2006-10-241-11/+10
* | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-23189-378/+189
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Many files:unknown2006-12-23210-420/+210
* | | | | | | | | | | | | | | | | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-224-24/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Post-merge fix (related to bug 24200 changes)unknown2006-12-202-2/+5
| * | | | | | | | | | | | | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildunknown2006-12-204-22/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Remove warnings by castingunknown2006-12-191-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200unknown2006-12-194-1/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | Added innodb_rollback_on_timeout option to restore the 4.1 unknown2006-12-194-1/+15
| | * | | | | | | | | | | | | | | | | | | | | | | Bug #24947: REPEAT function returns NULL when passed a field as the count par...unknown2006-12-191-20/+19
| | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2006-12-191-19/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | This ChangeSet must be null-merged to 5.1.unknown2006-12-181-19/+29
| | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2006-12-123-55/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-12-052-57/+234
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-12-052-57/+234
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \