tnurnberg@sin.azundris.com
c8bc42ccff
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/tnurnberg/work/mysql-5.1-maint-24660
2007-01-12 00:15:22 +01:00
cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa
2706b3d737
Revert to old behavior. Including code to verify that a cluster is not
...
readonly seems like a good idea, but the test suite isn't expecting those
statements in some places.
Figure out how we want to use this code later.
2007-01-11 14:54:03 -05:00
tnurnberg@mysql.com/sin.azundris.com
34122240cf
Bug#24660: "enum" field type definition problem
...
ENUMs weren't allowed to have character 0xff, a perfectly good character in many locales.
This was circumvented by mapping 0xff in ENUMs to ',', thereby prevent actual commas from
being used (because they too would get converted to 0xff on load). Now if 0xff makes an
appearance, we find a character not used in the enum and use that as a separator. If no
such character exists, we throw an error.
Any solution would have broken some sort of existing behaviour. This solution should
serve both fractions (those with 0xff and those with ',' in their enums), but
WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE WITH 0xff IN THEIR ENUMS. :-/
That is, mysqldump with their current server, and restore when upgrading to one with
this patch.
(port of the original 4.1 patch. incorporates some suggestions by kaamos.)
2007-01-09 20:23:12 +01:00
cmiller@zippy.cornsilk.net
993f325d37
Post-merge cleanup and fix minor BUILD/... "="-equality syntax
...
error.
2007-01-07 12:21:42 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
cmiller@zippy.cornsilk.net
1942fd0a49
Forgot to add result file to changeset. :(
2007-01-06 18:40:43 -05:00
cmiller@zippy.cornsilk.net
95e73e66f0
Use relative dates so that the tests don't fail when the year
...
changes.
2007-01-06 18:32:55 -05:00
cmiller@zippy.cornsilk.net
b54f20f865
A writability test in a prereq file polluted the binlog.
...
Reset the info after using those files.
2007-01-06 12:34:16 -05:00
brian@zim.(none)
05d05c776f
Fix for when shell version of mysql-test-run is called.
2007-01-05 22:28:53 -08:00
brian@zim.(none)
77004aabf2
Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue.
2007-01-05 20:20:53 -08:00
brian@zim.(none)
c578350e05
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2
The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space).
2007-01-04 11:41:17 -08: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
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
1b8bd0d246
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.0
2006-12-31 01:04:07 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01: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
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
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
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
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
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
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
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