df@pippilotta.erinye.com
dd7185eadd
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-18 20:18:32 +02:00
df@pippilotta.erinye.com
e9387bf5ce
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-18 20:15:27 +02:00
df@pippilotta.erinye.com
94a3e239c5
don't use bk cset in commit e-mails
2007-06-18 20:13:33 +02:00
tsmith@quadxeon.mysql.com
918090030b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
2007-06-15 01:57:33 +02:00
df@pippilotta.erinye.com
02f5ba1076
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 19:29:13 +02:00
df@pippilotta.erinye.com
f58ca7e057
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-13 19:24:46 +02:00
df@pippilotta.erinye.com
35413f161a
fix.
2007-06-13 19:23:13 +02:00
df@pippilotta.erinye.com
6de0de60cf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 13:19:43 +02:00
df@pippilotta.erinye.com
f5d6c2906d
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:35:13 +02:00
df@pippilotta.erinye.com
c379f6d99c
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
2007-06-13 12:04:05 +02:00
df@pippilotta.erinye.com
4f9c468eb9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
2007-06-13 11:54:28 +02:00
df@pippilotta.erinye.com
36ea2e3091
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-06-13 11:48:07 +02:00
df@pippilotta.erinye.com
320ec82616
BK changes for
...
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
2007-06-13 11:44:58 +02:00
msvensson@pilot.(none)
6b80cefbb1
Remove last line, making it possible to merge
2007-06-07 19:59:06 +02:00
msvensson@pilot.blaudden
a7bc5a413e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-15 18:23:36 +02:00
msvensson@pilot.blaudden
a0b1e5406d
Add triggers for detecting bad changesets to mysql-5.0
2007-05-15 17:04:31 +02:00
serg@janus.mylan
689eed7406
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-02-21 11:36:23 +01:00
cmiller@zippy.cornsilk.net
2f1b34a581
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my50-bug25807
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25807/my51-bug25807
2007-02-13 17:21:50 -05:00
cmiller@zippy.cornsilk.net
9e9dd4327c
Bug#25807: LOAD DATA INFILE does not work with Pipes
...
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.
2007-02-13 16:35:29 -05:00
msvensson@pilot.mysql.com
b74a067246
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-02-13 10:27:39 +01:00
msvensson@pilot.mysql.com
818cb094fc
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-02-13 09:56:56 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08
Test and bug fixes and removed unneccessary files.
2007-02-05 17:09:44 +02:00
cmiller@zippy.cornsilk.net
b81f4a8314
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-31 16:14:42 -05:00
cmiller@zippy.cornsilk.net
5a0ac8afe7
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:14:12 -05:00
cmiller@zippy.cornsilk.net
a3a9d8bd84
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341
2007-01-31 16:09:36 -05:00
cmiller@zippy.cornsilk.net
24e3508b0e
Bug#25341: "init.d/mysql stop" may timeout too quickly
...
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.
2007-01-31 15:39:41 -05:00
serg@janus.mylan
2141f9f0ee
making diff-p-helper obsolete
2007-01-29 18:07:02 +01:00
mtaylor@qualinost.(none)
b7a7d3f7c6
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-26 13:11:10 -08:00
cmiller@zippy.cornsilk.net
f74992258a
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f
Bug #25879 : THD::options isn't set with ulonglong values and \
...
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.
2007-01-26 14:47:12 -05:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
cmiller@zippy.cornsilk.net
00fc0fa9ee
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my51-bug23721
2007-01-17 13:25:05 -05:00
cmiller@zippy.cornsilk.net
8a746fc0d2
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
2007-01-17 13:24:20 -05:00
cmiller@zippy.cornsilk.net
332f9ff8b4
Bug#23721: compile fails: check-cpu mishandles cpu flags with \
...
hyphen in it (like ds-cpl).
convert illegal chars in cpu flags to '_' for variable assignment
2007-01-17 13:22:50 -05:00
holyfoot/hf@hfmain.(none)
b4c0867df1
Merge mysql.com:/d2/hf/clean/my51-clean
...
into mysql.com:/d2/hf/common/my51-common
2006-12-31 12:41:42 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
feff4a5ec4
bdb_notembedded.test gone
2006-12-28 10:03:25 +04:00
tsmith/tim@siva.hindu.god
4d8942648b
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-26 12:43:57 -07:00
cmiller@zippy.cornsilk.net
fa6f173bf8
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-12-22 16:05:59 -05:00
cmiller@zippy.cornsilk.net
8ffe6fb522
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-12-22 16:02:54 -05:00
cmiller@zippy.cornsilk.net
83355bfb81
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my50-bug22555
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug22555/my51-bug22555
2006-12-22 15:59:10 -05:00
cmiller@zippy.cornsilk.net
50726b2322
Bug#22555: STDDEV yields positive result for groups with only one row
...
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.
2006-12-22 15:37:37 -05:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
kostja@bodhi.local
2525e16c73
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-29 11:44:37 +03:00
msvensson@neptunus.(none)
04d5a42bbf
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-28 20:59:57 +01:00
msvensson@neptunus.(none)
86f0d1bb03
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-11-24 12:12:25 +01:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
anozdrin/alik@booka.
db522c30f3
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into booka.:/home/alik/MySQL/devel/5.1-rt-im
2006-11-22 17:34:09 +03:00
cmiller@zippy.cornsilk.net
fbfeccfe91
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-13 13:19:49 -05:00
cmiller@zippy.cornsilk.net
ff26bf49c8
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-13 13:19:13 -05:00
cmiller@zippy.cornsilk.net
6d97850c3b
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my50-bug18761
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug18761/my51-bug18761
2006-11-13 13:17:02 -05:00