tsmith/tim@siva.hindu.god
682596d7ce
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-26 22:28:28 -07:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
82b03f29ac
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
2006-12-26 16:23:05 -08:00
tsmith/tim@siva.hindu.god
0cb9cee7f4
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
2006-12-26 12:33:21 -08: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
tsmith/tim@siva.hindu.god
828121bd6d
In func_group.test, round the results of std() for some calls, because Windows' sqrt() function appears to return fewer "significant" digits than the Unix implementations.
...
This is for bug #22555 .
2006-12-26 12:42:54 -07:00
svoj@mysql.com/june.mysql.com
28d3ee656d
After merge fix.
2006-12-26 22:10:02 +04:00
holyfoot/hf@hfmain.(none)
52e716971f
Merge hf@192.168.21.12:work/embt/my50-embt
...
into mysql.com:/d2/hf/my51-embt
2006-12-26 20:22:17 +04:00
holyfoot/hf@mysql.com/deer.(none)
7254ed10e8
lock_multi disabled
2006-12-26 20:22:16 +04:00
svoj@june.mysql.com
838fe3a04e
Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
2006-12-26 18:04:31 +04:00
svoj@mysql.com/june.mysql.com
591712f53f
BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try to
...
repair it
Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.
DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.
With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.
2006-12-26 17:47:30 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
10475626c1
Fix for bug #23616 : Week() changed behaviour between 5.0.22 and 5.0.24
...
Consider double values as legal date{time} function's arguments
(i.e. allow dates in internal format YYYYMMDDHHMMSS.XXXXXX).
2006-12-26 15:08:41 +04:00
gluh@mysql.com/eagle.(none)
24a4d9d3f5
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2006-12-25 12:58:44 +04:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
tsmith/tim@siva.hindu.god
a91e71f541
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-22 14:11:23 -07:00
tsmith/tim@siva.hindu.god
d13077c794
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-22 14:10:15 -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
tsmith/tim@siva.hindu.god
c5aa8fea82
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-22 13:43:48 -07:00
tsmith/tim@siva.hindu.god
bb108f57c1
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-22 13:41:10 -07: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
tsmith/tim@siva.hindu.god
26c0934ee3
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/41
2006-12-22 13:23:12 -07:00
kaa@polly.local
7245cb3d92
Merge polly.local:/tmp/maint/bug24037/my51-bug24037
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2006-12-22 17:33:54 +03:00
kaa@polly.local
381a79f72c
Merge polly.local:/tmp/maint/bug24037/my50-bug24037
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2006-12-22 17:26:14 +03:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
kaa@polly.local
2e68c3408e
Merge polly.local:/tmp/maint/bug24037/my41-bug24037
...
into polly.local:/home/kaa/src/maint/mysql-4.1-maint
2006-12-22 16:19:45 +03:00
kaa@polly.local
dffa5d05d7
Merge polly.local:/tmp/maint/bug24037/my50-bug24037
...
into polly.local:/tmp/maint/bug24037/my51-bug24037
2006-12-22 16:14:57 +03:00
kaa@polly.local
581afd4ccc
Merge polly.local:/tmp/maint/bug24037/my41-bug24037
...
into polly.local:/tmp/maint/bug24037/my50-bug24037
2006-12-22 16:08:10 +03:00
msvensson@pilot.mysql.com
4563cb45f2
Add the missing file
2006-12-22 13:57:33 +01:00
msvensson@pilot.mysql.com
70b2f28f55
Wait for mysqld connected to NDB to come out of read only mode
2006-12-22 13:34:23 +01:00
kaa@polly.local
86a9ad6883
Fix for the bug #24037 "Lossy Hebrew to Unicode conversion".
...
Added definitions for the following Hebrew characters as specified by the ISO/IEC 8859-8:1999:
LEFT-TO-RIGHT MARK (LRM)
RIGHT-TO-LEFT MARK (RLM)
2006-12-22 15:30:37 +03:00
mats@romeo.(none)
c2f7f52a25
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-12-22 12:24:07 +01:00
msvensson@pilot.mysql.com
1f006872c8
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2006-12-22 10:20:39 +01:00
msvensson@pilot.mysql.com
0af60de724
Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061215122345|24188
2006-12-22 10:20:20 +01:00
msvensson@pilot.mysql.com
8da9222853
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2006-12-22 10:00:58 +01:00
msvensson@pilot.mysql.com
b28e8faf23
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2006-12-22 10:00:12 +01:00
msvensson@pilot.mysql.com
73d82523a3
Set default number of masters to 1
2006-12-22 09:59:41 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
f495b5f923
After merge fix
2006-12-22 11:43:04 +04:00
bar@bar.intranet.mysql.r18.ru
53a59f266f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into mysql.com:/usr/home/bar/mysql-5.1.b17642
2006-12-22 11:20:55 +04:00
tsmith/tim@siva.hindu.god
8075fc447e
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-21 18:23:14 -07:00
tsmith/tim@siva.hindu.god
f204db4dd1
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
...
into siva.hindu.god:/usr/home/tim/m/bk/50
2006-12-21 18:20:09 -07:00
tsmith/tim@siva.hindu.god
93bbb19fc1
Merge siva.hindu.god:/usr/home/tim/m/bk/g41
...
into siva.hindu.god:/usr/home/tim/m/bk/41
2006-12-21 18:18:27 -07:00
msvensson@pilot.mysql.com
c862eae163
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2006-12-22 01:13:02 +01:00
msvensson@pilot.mysql.com
a386c9d7cf
Merge neptunus:mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2006-12-22 01:11:27 +01:00
msvensson@pilot.mysql.com
e1fcd181ef
Merge neptunus:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2006-12-22 00:58:32 +01:00
msvensson@pilot.mysql.com
acc5e0e3d5
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2006-12-22 00:39:08 +01:00
msvensson@pilot.mysql.com
2e744d5644
Bug #23125 [patch] trigger test fails when run as root
...
- Skip tests using chmod when running as root
2006-12-22 00:38:34 +01:00
mats@romeo.(none)
8d4bddefd0
Merge romeo.(none):/home/bk/b22864-mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/merge-b22864-myql-5.1-new-rpl
2006-12-21 19:36:28 +01:00