summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\ \ \
| | | | * \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-051-5/+14
| | | | |\ \ \
| | | | * \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-042-57/+234
| | | | |\ \ \ \
| | | | | * \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2006-11-302-9/+11
| | | | | |\ \ \ \
| | | | | | * | | | bug#18487 UPDATE IGNORE not supported for unique constraint violation of non...unknown2006-11-302-8/+9
| | | | | * | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-302-51/+226
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2006-11-301-0/+15
| | | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-142-51/+211
| | | | | | |\ \ \ \ \ \ | | | | | | | |_|_|_|_|/ | | | | | | |/| | | | |
| | * | | | | | | | | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836unknown2006-12-051-8/+0
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maintunknown2006-12-041-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge naruto.:C:/cpp/bug17733/my50-bug17733unknown2006-12-041-3/+8
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836unknown2006-12-042-57/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-12-0450-273/+444
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | / / | | | | |_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-12-021-3/+69
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043unknown2006-12-011-74/+51
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731unknown2006-11-292-0/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my50-bug22043unknown2006-11-292-9/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-291-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-11-2861-533/+1829
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-283-1/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2006-11-271-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge polly.local:/tmp/maint/bug22077/my50-bug22077unknown2006-11-241-6/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | WL #3031unknown2006-12-212-6/+9
* | | | | | | | | | | | | | | | | | | | | | | WL #3031unknown2006-12-201-9/+8
* | | | | | | | | | | | | | | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-archunknown2006-12-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | WL# 3031unknown2006-12-181-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-12-184-55/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2006-12-124-55/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/22372/my50-22372unknown2006-12-073-54/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | mergingunknown2006-12-072-2/+3
| | | * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/22372/my41-22372unknown2006-12-063-54/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | bug #22372 (LOAD DATA crashes the table with the geometry field)unknown2006-12-063-53/+77
| | | | * | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-11-294-18/+9
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-11-221-3/+7
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-11-212-14/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtimeunknown2006-11-161-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1-optunknown2006-12-061-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | bug #20835 (Subqueries: literal string with =any fails)unknown2006-12-031-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-archunknown2006-12-0812-2/+12764
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \