summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-01-284-0/+429
|\ | | | | | | into trift2.:/MySQL/M51/push-5.1
| * Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50tsmith@ramayana.hindu.god2008-01-241-2/+2
| |\ | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51
| | * 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
| | |\ | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| * | | 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
| |\ \ \ | | | |/ | | |/| | | | | into ramayana.hindu.god:/home/tsmith/m/inno/51-triggers
| | * | Add triggers to notify InnoDB developers when MySQL developers change filestsmith@ramayana.hindu.god2008-01-234-0/+433
| | | | | | | | | | | | | | | | that they control.
* | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2008-01-041-3/+9
|\ \ \ \ | |/ / / | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| * | | Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-141-3/+9
| |\ \ \ | | | |/ | | |/| | | | | into chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
| | * | post-commit:jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-141-2/+1
| | | | | | | | | | | | | | | | Rationalise setting $FROM.
| | * | post-commit:jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-041-3/+10
| | |/ | | | | | | | | | Use $BK_USER, if set, in preference to $USER
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-communitycmiller@zippy.cornsilk.net2007-11-021-0/+26
|\ \ \ | |/ / | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
| * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-10-251-0/+26
| |\ \ | | |/ | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-10-251-0/+26
| | |\ | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | | * 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
|\ \ \ \ | |/ / / | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-06-181-2/+2
| |\ \ \ | | |/ / | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-06-181-2/+2
| | |\ \ | | | |/ | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | | * 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
| |\ \ \ | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
| | * \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2007-06-131-4/+6
| | |\ \ \ | | | |/ / | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-builddf@pippilotta.erinye.com2007-06-131-4/+6
| | | |\ \ | | | | |/ | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | | | * 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
| | | | |\ | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
| | | * | \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
| | * | \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | | * \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
| | | | * | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitdf@pippilotta.erinye.com2007-06-131-22/+18
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
| | | | | * | | BK changes fordf@pippilotta.erinye.com2007-06-131-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
| * | | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
| | * | | | Add triggers for detecting bad changesets to mysql-5.0msvensson@pilot.blaudden2007-05-152-0/+164
| | |/ / /
* | | | | Merge ↵cmiller@zippy.cornsilk.net2007-04-271-0/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
| * | | | adjust version string in mysql-5.0-community commit triggerdf@pippilotta.erinye.com2007-03-071-1/+1
| | | | |
| * | | | Merge ↵cmiller@zippy.cornsilk.net2007-02-271-0/+16
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | mysqldev@production.mysql.com:my/build-200702201448-5.0.36/mysql-5.0-release/ into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a single statement. --- Bug#24795: SHOW PROFILE Profiling is only partially functional on some architectures. Where there is no getrusage() system call, presently Null values are returned where it would be required. Notably, Windows needs some love applied to make it as useful. Syntax this adds: SHOW PROFILES SHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n] where "n" is an integer and "types" is zero or many (comma-separated) of "CPU" "MEMORY" (not presently supported) "BLOCK IO" "CONTEXT SWITCHES" "PAGE FAULTS" "IPC" "SWAPS" "SOURCE" "ALL" It also adds a session variable (boolean) "profiling", set to "no" by default, and (integer) profiling_history_size, set to 15 by default. This patch abstracts setting THDs' "proc_info" behind a macro that can be used as a hook into the profiling code when profiling support is compiled in. All future code in this line should use that mechanism for setting thd->proc_info. --- Tests are now set to omit the statistics. --- Adds an Information_schema table, "profiling" for access to "show profile" data. --- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-3--bug24795 into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community --- Fix merge problems. --- Fixed one bug in the query_source being NULL. Updated test results. --- Include more thorough profiling tests. Improve support for prepared statements. Use session-specific query IDs, starting at zero. --- Selecting from I_S.profiling is no longer quashed in profiling, as requested by Giuseppe. Limit the size of captured query text. No longer log queries that are zero length.
| | * | | Bug#24822: Patch: uptime_since_flush_statuscmiller@zippy.cornsilk.net2007-01-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the number of seconds since flush as a new status variable named "Uptime_since_flush_status". --- Override the post-flush value, as a second could pass between the two statements.
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-communitycmiller@zippy.cornsilk.net2007-01-031-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
| | | * | | Bug#24795: Add SHOW PROFILEcmiller@zippy.cornsilk.net2007-01-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch contributed by Jeremy Cole. CLA received Oct 2006 by Kaj Arnö Add rudimentary query profiling support.
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.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
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807
| * | | | | | Bug#25807: LOAD DATA INFILE does not work with Pipescmiller@zippy.cornsilk.net2007-02-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Showstopper and regression against 5.0.24. Previously, we ignored seek() errors (see Bug#22828) and let seek()s against pipes fail. Now, since we check that a seek didn't fail, and return without reading, this bug popped up. This restores the behavior for file-ish objects that could never be seek()ed.
* | | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-02-131-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
| * | | | | | Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maintmsvensson@pilot.mysql.com2007-02-131-0/+6
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
| | * | | | | 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
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
* | \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341cmiller@zippy.cornsilk.net2007-01-311-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| * \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341cmiller@zippy.cornsilk.net2007-01-311-0/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
View Lorry Controller Status