istruewing@chilla.local
54c147a1bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-01-03 10:27:51 +01:00
mskold/marty@mysql.com/linux.site
a4e84daa7f
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-01-03 10:04:47 +01:00
istruewing@chilla.local
d37ff7d7bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-03 08:52:50 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
5b1b0a6ff4
Merge mysql.com:/d2/hf/common/my41-common
...
into mysql.com:/d2/hf/opt/my41-opt
2007-01-03 11:17:00 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
79361c655a
Merge mysql.com:/d2/hf/common/my50-common
...
into mysql.com:/d2/hf/opt/my50-opt
2007-01-03 11:13:01 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
8c2d34c3c6
merging
2007-01-03 03:35:57 +04:00
mskold/marty@mysql.com/linux.site
500918f2ab
bug #25296 Truncate table converts NDB disk based tables to in-memory tables: implemented ha_ndbcluster::update_create_info
2007-01-02 22:31:29 +01:00
malff/marcsql@weblab.(none)
0055056c91
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
2007-01-02 14:18:13 -07:00
holyfoot/hf@hfmain.(none)
4c588df26e
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/common/my51-common
2007-01-02 18:02:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
a44106c07c
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/common/my50-common
2007-01-02 18:00:30 +04:00
kent@kent-amd64.(none)
7281ab80c8
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2007-01-02 11:06:16 +01:00
kent@mysql.com/kent-amd64.(none)
499eb4d8ba
view.result:
...
Temporary work around for bug#25359
2007-01-02 11:01:48 +01: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)
874d366500
Merge mysql.com:/d2/hf/clean/my50-clean
...
into mysql.com:/d2/hf/common/my50-common
2006-12-31 12:39:20 +04:00
svoj@june.mysql.com
9d106f7a10
Merge mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.1-engines
2006-12-29 17:33:34 +04:00
bar@mysql.com
3f20de5145
After merge fix:
...
Adding "flush log" before running mysqlbinlog.
2006-12-29 17:12:59 +04:00
bar@mysql.com
b918a98242
After merge fix.
...
Adding "flush logs" to fix test failure.
2006-12-29 16:00:51 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
842b23a8fc
WL#3630 (add embedded server to pushbuild)
...
5.1-related fixes
libmysqld/Makefile.am fixed to recompile and link ha_*.cc files that
keep dependance on THD structure.
Minor fixes to make tests working.
2006-12-28 09:42:04 +04:00
tomas@poseidon.mysql.com
4333bcabd7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2006-12-27 19:36:41 +01:00
svoj@mysql.com/april.(none)
2fc0bca6a4
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines
2006-12-27 17:55:33 +04:00
tomas@poseidon.
044c410968
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.:/home/tomas/mysql-5.1-new-ndb
2006-12-27 11:01:54 +01:00
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
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
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
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
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
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
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
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
istruewing@chilla.local
dee46f9100
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2006-12-21 18:41:01 +01:00