summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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 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
| | * | | | | Bug#25341: "init.d/mysql stop" may timeout too quicklycmiller@zippy.cornsilk.net2007-01-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thirty five seconds is entirely too short of a period to wait for a server to exit. Instead, make a valliant effort to make sure it exits, and only give up after a very long period (arbitrarily chosen as 15 minutes). In addition, if we're being asked to restart the server, then don't try to start again if trying to stop the server failed. --- Return zero by default, when the script exits. --- Set return-/exit-value based on whether we successfully dealt with the PID-file. --- Don't wait that long if the program we're waiting on exits. It should only exit if the server is not going to be started.
* | | | | | | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintmtaylor@qualinost.(none)2007-01-261-0/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | |_|_|_|/ / |/| | | | | into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
| * | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gcacmiller@zippy.cornsilk.net2007-01-261-0/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| | * | | | | Bug #25879: THD::options isn't set with ulonglong values and \cmiller@zippy.cornsilk.net2007-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables Bits higher than 2**31 were impossible to set on THD::options. It's probably a remnant from a time when options was a 32-bit integer. Now, use unsigned long-long constants and variables to set and clear THD::options. --- Pulled comments back to column 49.
* | | | | | | Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51tsmith@siva.hindu.god2007-01-181-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
| * \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721cmiller@zippy.cornsilk.net2007-01-171-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | / / / / | | |_|/ / / / | |/| | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721
| | * | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721cmiller@zippy.cornsilk.net2007-01-171-0/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
| | | * | | Bug#23721: compile fails: check-cpu mishandles cpu flags with \cmiller@zippy.cornsilk.net2007-01-171-0/+1
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | hyphen in it (like ds-cpl). convert illegal chars in cpu flags to '_' for variable assignment
| | | * | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-11-241-3/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
| * | | \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/50tsmith/tim@siva.hindu.god2006-12-261-0/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | into siva.hindu.god:/usr/home/tim/m/bk/51
| | * | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555cmiller@zippy.cornsilk.net2006-12-221-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| | * | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-11-282-3/+13
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
| | * \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761cmiller@zippy.cornsilk.net2006-11-131-0/+8
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
| * | \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555cmiller@zippy.cornsilk.net2006-12-221-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| | * \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555cmiller@zippy.cornsilk.net2006-12-221-0/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555
| | | * | | | | | Bug#22555: STDDEV yields positive result for groups with only one rowcmiller@zippy.cornsilk.net2006-12-221-0/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When only one row was present, the subtraction of nearly the same number resulted in catastropic cancellation, introducing an error in the VARIANCE calculation near 1e-15. That was sqrt()ed to get STDDEV, the error was escallated to near 1e-8. The simple fix of testing for a row count of 1 and forcing that to yield 0.0 is insufficient, as two rows of the same value should also have a variance of 0.0, yet the error would be about the same. So, this patch changes the formula that computes the VARIANCE to be one that is not subject to catastrophic cancellation. In addition, it now uses only (faster-than-decimal) floating point numbers to calculate, and renders that to other types on demand.
* | | | | | | | Merge mysql.com:/d2/hf/clean/my51-cleanholyfoot/hf@hfmain.(none)2006-12-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into mysql.com:/d2/hf/common/my51-common
| * | | | | | | bdb_notembedded.test goneholyfoot/hf@mysql.com/hfmain.(none)2006-12-281-0/+2
| | | | | | | |