summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
* | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-12-041-0/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1msvensson@neptunus.(none)2006-11-232-3/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
| * \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761cmiller@zippy.cornsilk.net2006-11-131-0/+8
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-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/bug18761/my51-bug18761
| | | * | | | | | Bug#18761: constant expression as UDF parameters not passed in as constantcmiller@zippy.cornsilk.net2006-11-131-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that set up data to be passed to user-defined functions was very old and analyzed the "Type" of the data that was passed into the UDF, when it really should analyze the "return_type", which is hard-coded for simple Items and works correctly for complex ones like functions. --- Added test at Sergei's behest.
| * | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860cmiller@zippy.cornsilk.net2006-11-111-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my51-bug22860
| | * | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my41-bug22860cmiller@zippy.cornsilk.net2006-11-111-0/+2
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22860/my50-bug22860
| | | * | | | | | Bug #22860: Option --memlock should be revisitedcmiller@zippy.cornsilk.net2006-11-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support says that memlock doesn't work on OSes other than Solaris. Add a warning about --memlock to the crash monologue.
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@bodhi.local2006-11-291-3/+11
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
| * | | | | | | | Merge mysql.com:/home/bk/MERGE/mysql-5.0-mergelars@black.(none)2006-11-131-3/+11
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | * | | | | | | Merge mysql.com:/home/bk/MERGE/mysql-4.1-mergelars@mysql.com/black.(none)2006-11-131-3/+11
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.0-merge
| | | * | | | | | Correcting BUG/WL identifier extraction to allow multiple references to auxilaryaelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi2006-11-121-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified the first in the comments. The referred bugs wls can be typed in same as the targeted clickable format. If the the target of the fix is a WL and there are some references to bugs then the first found reference is regarded as "co-target" so that the bug's identifier comes up on the subject line along with the WL's and commit mail will update the bug page. The latter feature can be disarmed (if there is no need to update the referred bug's page) with typing the first a pseudo-bug pattern (bug#0). This paticular cset will generate subject line containing bug#0 (as it was the first referred) whereas the old version would put in the subject line the last referred pattern (e.g bug#2147483648).
| | * | | | | | | Merge mysql.com:/home/bkroot/mysql-5.0-rpllars@mysql.com/black.(none)2006-11-131-0/+2
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.0-merge
| | | * | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpllars/lthalmann@mysql.com/dl145h.mysql.com2006-11-071-0/+2
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
| * | | | | | | | Merge mysql.com:/home/bkroot/mysql-5.1-new-rpllars@black.(none)2006-11-131-0/+2
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge
| | * | | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpllars/lthalmann@dl145h.mysql.com2006-11-071-0/+2
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
| | | * | | | | | Merge mysql.com:/usr/home/bar/mysql-5.0-rplbar@bar.intranet.mysql.r18.ru2006-11-031-0/+1
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.1-rpl
| | | | * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-011-0/+1
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b22877
| | | | | * | | | | Bug#22877 replication character sets get out ofbar@mysql.com/bar.intranet.mysql.r18.ru2006-11-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sync using replicate-wild-ignore-table Problem: changes in character set variables before an action on an replication-ignored table makes slave to forget new variable values. Fix: initialize one_shot variables only when 4.1 -> 5.x replication is running.
| | | | * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rplbar@mysql.com/bar.intranet.mysql.r18.ru2006-10-301-0/+1
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-5.0.b18908