summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Expand)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-01-284-0/+429
|\
| * Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50tsmith@ramayana.hindu.god2008-01-241-2/+2
| |\
| | * Fix bug in BK trigger for sending changes to InnoDB devs.tsmith@ramayana.hindu.god2008-01-241-2/+2
| | * Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggerstsmith@ramayana.hindu.god2008-01-234-0/+433
| | |\
| * | | Update triggers lib for version MySQL 5.1tsmith@ramayana.hindu.god2008-01-231-8/+4
| * | | Merge ramayana.hindu.god:/home/tsmith/m/inno/50-triggerstsmith@ramayana.hindu.god2008-01-234-0/+433
| |\ \ \ | | | |/ | | |/|
| | * | Add triggers to notify InnoDB developers when MySQL developers change filestsmith@ramayana.hindu.god2008-01-234-0/+433
* | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2008-01-041-3/+9
|\ \ \ \ | |/ / /
| * | | Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-141-3/+9
| |\ \ \ | | | |/ | | |/|
| | * | post-commit:jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-141-2/+1
| | * | post-commit:jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-041-3/+10
| | |/
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communitycmiller@zippy.cornsilk.net2007-11-021-0/+26
|\ \ \ | |/ /
| * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-10-251-0/+26
| |\ \ | | |/
| | * Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-10-251-0/+26
| | |\
| | | * add new trigger to prevent certain naming clashesdf@pippilotta.erinye.com2007-10-251-0/+26
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationcmiller@zippy.cornsilk.net2007-10-174-25/+24
|\ \ \ \ | |/ / /
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-06-181-2/+2
| |\ \ \ | | |/ /
| | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-06-181-2/+2
| | |\ \ | | | |/
| | | * don't use bk cset in commit e-mailsdf@pippilotta.erinye.com2007-06-181-2/+2
| * | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildtsmith@quadxeon.mysql.com2007-06-151-22/+20
| |\ \ \
| | * \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-06-131-4/+6
| | |\ \ \ | | | |/ /
| | | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-06-131-4/+6
| | | |\ \ | | | | |/
| | | | * fix.df@pippilotta.erinye.com2007-06-131-4/+6
| | | | * Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitdf@pippilotta.erinye.com2007-06-131-21/+35
| | | | |\
| | | * | \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | |\ \ \
| | * | \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | |\ \ \ \ \
| | | * \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | | * | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | BK changes fordf@pippilotta.erinye.com2007-06-131-21/+35
| * | | | | | | Remove last line, making it possible to mergemsvensson@pilot.(none)2007-06-071-1/+0
| |/ / / / / /
| * | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.blaudden2007-05-152-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Add triggers for detecting bad changesets to mysql-5.0msvensson@pilot.blaudden2007-05-152-0/+164
| | |/ / /
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-former...cmiller@zippy.cornsilk.net2007-04-271-0/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adjust version string in mysql-5.0-community commit triggerdf@pippilotta.erinye.com2007-03-071-1/+1
| * | | | Merge mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-re...cmiller@zippy.cornsilk.net2007-02-271-0/+16
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Enclose profiling in preprocessor conditions.cmiller@zippy.cornsilk.net2007-02-221-0/+2
| | * | | Prevent bugs by making DBUG_* expressions syntactically equivalent cmiller@zippy.cornsilk.net2007-02-221-0/+9
| | * | | Bug#24822: Patch: uptime_since_flush_statuscmiller@zippy.cornsilk.net2007-01-181-0/+2
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+3
| | |\ \ \
| | | * | | Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+3
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-1/+1
|\ \ \ \ \ \
| * | | | | | making diff-p-helper obsoleteserg@janus.mylan2007-01-291-1/+1
* | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807cmiller@zippy.cornsilk.net2007-02-131-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Bug#25807: LOAD DATA INFILE does not work with Pipescmiller@zippy.cornsilk.net2007-02-131-0/+2
* | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-131-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.mysql.com2007-02-131-0/+6
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Test and bug fixes and removed unneccessary files.jani@a88-113-38-195.elisa-laajakaista.fi2007-02-051-0/+6
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341cmiller@zippy.cornsilk.net2007-01-311-0/+6
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341cmiller@zippy.cornsilk.net2007-01-311-0/+6
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341cmiller@zippy.cornsilk.net2007-01-311-0/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |