summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-272-2/+17
|\
| * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-2/+17
| |\
| | * WL#3072 Maria recovery:unknown2007-12-101-1/+1
| | * propagation to maria_repair_by_sort() and maria_repair_parallel()unknown2007-08-081-0/+15
| | * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-1/+1
| | |\
| | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-50/+1
| | | |\
| | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-50/+1
| | | | |\
| | | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-50/+1
| | | | | |\
| | | | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-50/+1
| | | | | | |\
| | | | | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-46/+1
| | | | | | | |\
| | | | | | | | * Merge gbichot3.local:/home/mysql_src/mysql-5.1-2unknown2006-08-091-46/+1
| | | | | | | | |\
| | | | | | | | | * Added storage/maria (based on MyISAM). WL#3245unknown2006-04-111-46/+1
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-271-3/+9
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0unknown2007-12-141-3/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | post-commit:unknown2007-12-141-2/+1
| | * | | | | | | | | post-commit:unknown2007-12-041-3/+10
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communityunknown2007-11-021-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-10-251-0/+26
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | / / / / / / / / | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-10-251-0/+26
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | add new trigger to prevent certain naming clashesunknown2007-10-251-0/+26
* | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-174-25/+24
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-181-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-181-2/+2
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | don't use bk cset in commit e-mailsunknown2007-06-181-2/+2
| * | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-06-151-22/+20
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-131-4/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-131-4/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | fix.unknown2007-06-131-4/+6
| | | | * | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitunknown2007-06-131-21/+35
| | | | |\ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitunknown2007-06-131-22/+18
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commitunknown2007-06-131-22/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitunknown2007-06-131-22/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitunknown2007-06-131-22/+18
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | BK changes forunknown2007-06-131-21/+35
| * | | | | | | | | | | | | | Remove last line, making it possible to mergeunknown2007-06-071-1/+0
| |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-05-152-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | / / / / / / / / / | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Add triggers for detecting bad changesets to mysql-5.0unknown2007-05-152-0/+164
| | |/ / / / / / / / / /
* | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...unknown2007-04-271-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | adjust version string in mysql-5.0-community commit triggerunknown2007-03-071-1/+1
| * | | | | | | | | | | Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...unknown2007-02-271-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Enclose profiling in preprocessor conditions.unknown2007-02-221-0/+2
| | * | | | | | | | | | Prevent bugs by making DBUG_* expressions syntactically equivalent unknown2007-02-221-0/+9
| | * | | | | | | | | | Bug#24822: Patch: uptime_since_flush_statusunknown2007-01-181-0/+2
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communityunknown2007-01-031-0/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#24795: Add SHOW PROFILEunknown2007-01-031-0/+3
* | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | making diff-p-helper obsoleteunknown2007-01-291-1/+1
* | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807unknown2007-02-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Bug#25807: LOAD DATA INFILE does not work with Pipesunknown2007-02-131-0/+2
* | | | | | | | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintunknown2007-02-131-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /