tsmith@quadxeon.mysql.com
a7f506db2a
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:52:31 +02:00
tsmith@quadxeon.mysql.com
97ba2109b0
ndb_gis.result:
...
post-merge fixup of test result
2007-03-29 12:45:23 +02:00
tsmith@quadxeon.mysql.com
9a7f345133
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:43:31 +02:00
tsmith@quadxeon.mysql.com
91f4b48541
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-29 12:40:49 +02:00
lars/lthalmann@mysql.com/dl145h.mysql.com
75668471d1
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-29 12:25:28 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
890bdb4fed
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 15:17:18 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
c29f404e53
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/home/ram/work/b21976/my51-b21976
2007-03-29 15:16:48 +05:00
tsmith@quadxeon.mysql.com
da8875a2ef
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:00:32 +02:00
msvensson@pilot.blaudden
dc01a80c37
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:55:09 +02:00
msvensson@pilot.blaudden
071783117f
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:54:59 +02:00
msvensson@pilot.blaudden
cb806be68d
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:48:05 +02:00
msvensson@pilot.blaudden
72cc8618d7
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-29 11:40:38 +02:00
msvensson@pilot.blaudden
f47c4368de
Merge pilot.blaudden:/home/msvensson/mysql/bug25309/my50-bug25309
...
into pilot.blaudden:/home/msvensson/mysql/bug25309/my51-bug25309
2007-03-29 11:38:48 +02:00
msvensson@pilot.blaudden
37ffc0c391
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-29 11:37:21 +02:00
msvensson@pilot.blaudden
0e04aec960
Make the script detect --default-storage-engine=x and
...
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
2007-03-29 11:31:50 +02:00
tsmith@quadxeon.mysql.com
07f94fa199
gis_generic test cases:
...
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
2007-03-29 11:20:08 +02:00
gkodinov/kgeorge@magare.gmz
82ecff6a76
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 12:09:55 +03:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c132038451
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b21976/my50-b21976
2007-03-29 13:37:07 +05:00
sergefp@pylon.mylan
87d98bec74
Merge mysql.com:/home/psergey/mysql-5.0-merge
...
into mysql.com:/home/psergey/mysql-5.1-merge
2007-03-29 12:24:23 +04:00
gkodinov/kgeorge@magare.gmz
1a2ca44e2b
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B27300-5.0-opt
2007-03-29 11:01:32 +03:00
joerg@trift-lap.fambruehe
4507c6757a
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-29 09:41:39 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
8c5b59e416
Merge mysql.com:/home/ram/work/b21976/my50-b21976
...
into mysql.com:/home/ram/work/b21976/my51-b21976
2007-03-29 12:04:02 +05:00
istruewing@chilla.local
d0ad6cd45b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-29 08:36:57 +02:00
sergefp@mysql.com
399bc9861e
Merge of BUG#26624 and BUG#26625
2007-03-29 10:35:28 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
73f0c5d7c6
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26359/b26359.5.0
2007-03-29 11:06:15 +05:00
bar@bar.myoffice.izhnet.ru
306af7f4bc
Merge mysql.com:/home/bar/mysql-5.0.b27079
...
into mysql.com:/home/bar/mysql-5.1-new-rpl
2007-03-29 10:36:28 +05:00
bar@mysql.com
6d290278cc
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-5.0.b27079
2007-03-29 10:19:45 +05:00
tsmith@quadxeon.mysql.com
18cc602419
Merge tsmith.mysql.internal:/home/tsmith/m/inno/mar28/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 07:13:35 +02:00
tsmith@siva.hindu.god
4ffeba761f
Applied innodb-5.1-ss1381 snapshot
...
Bug #27381 : InnoDB exits when attempting to rename table to non-existant database
Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
os_file_handle_error().
2007-03-28 22:46:28 -06:00
ramil/ram@ramil.myoffice.izhnet.ru
95b58449f9
Merge mysql.com:/home/ram/work/b26359/b26359.5.0
...
into mysql.com:/home/ram/work/b26359/b26359.5.1
2007-03-29 09:38:46 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e3c34c9cbf
Fix for bugs
...
#27176 : Assigning a string to an year column has unexpected results
#26359 : Strings becoming truncated and converted to numbers under STRICT mode
Problems:
1. storing a string to an integer field we don't check
if strntoull10rnd() returns MY_ERRNO_EDOM error.
Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
Fix: use strntoull10rnd() instead.
2007-03-29 09:08:30 +05:00
tsmith@siva.hindu.god
0d65ee796b
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 19:50:41 -06:00
tsmith@siva.hindu.god
d4e0de8fda
Update test for bug #24563 (MBROverlaps does not seem to function propertly.); ARCHIVE doesn't support AUTO_INCREMENT, so specify PK values explicitly
2007-03-28 19:39:43 -06:00
tsmith@siva.hindu.god
5aa073b1e4
Merge siva.hindu.god:/home/tsmith/m/bk/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 17:41:52 -06:00
tsmith@siva.hindu.god
8350721c88
Update test for bug #24563 (MBROverlaps does not seem to function propertly.):
...
- Add primary key to test table, so NDB with binlog doesn't complain
- Add extra results for bdb_gis.result
2007-03-28 17:40:42 -06:00
tsmith@siva.hindu.god
ecd22993cf
Bug #26642 : create index corrupts table definition in .frm
...
Thanks to Martin Friebe for finding and submitting a fix for this bug!
A table with maximum number of key segments and maximum length key name
would have a corrupted .frm file, due to an incorrect calculation of the
complete key length. Now the key length is computed correctly (I hope) :-)
MyISAM would reject a table with the maximum number of keys and the maximum
number of key segments in all keys. It would allow one less than this total
maximum. Now MyISAM accepts a table defined with the maximum. (This is a
very minor issue.)
2007-03-28 15:25:13 -06:00
kent@kent-amd64.(none)
082de779b3
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-28 22:50:43 +02:00
baker@bk-internal.mysql.com
1b9c4358a8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-28 22:31:10 +02:00
tsmith@siva.hindu.god
7366ecdb0e
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-03-28 12:27:37 -06:00
tsmith@siva.hindu.god
c01629a7cd
Merge siva.hindu.god:/home/tsmith/m/bk/maint/bmisc/51
...
into siva.hindu.god:/home/tsmith/m/bk/maint/51
2007-03-28 11:47:28 -06:00
sergefp@mysql.com
a8d439728f
BUG#26624: high mem usage (crash) in range optimizer
...
- Added PARAM::alloced_sel_args where we count the # of SEL_ARGs
created by SEL_ARG tree cloning operations.
- Made the range analyzer to shortcut and not do any more cloning
if we've already created MAX_SEL_ARGS SEL_ARG objects in cloning.
- Added comments about space complexity of SEL_ARG-graph
representation.
2007-03-28 20:16:01 +04:00
istruewing@chilla.local
3f0bfd831a
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 17:06:09 +02:00
istruewing@chilla.local
20bb4ae8cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:57:08 +02:00
bar@mysql.com
4b3826ba8c
Bug#22638 SOUNDEX broken for international characters
...
Problem: SOUNDEX returned an invalid string for international
characters in multi-byte character sets.
For example: for a Chinese/Japanese 3-byte long character
_utf8 0xE99885 it took only the very first byte 0xE9,
put it into the outout string and then appended with three
DIGIT ZERO characters, so the result was 0xE9303030 - which
is an invalide utf8 string.
Fix: make SOUNDEX() multi-byte aware and - put only complete
characters into result, thus return only valid strings.
This patch also makes SOUNDEX() compatible with UCS2.
2007-03-28 18:57:30 +05:00
msvensson@pilot.blaudden
1ccf651a3a
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-28 15:57:27 +02:00
msvensson@pilot.blaudden
c2bbf3c05e
Add back the look for exe_mysql
2007-03-28 15:56:57 +02:00
serg@janus.mylan
52ca332600
Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0-build
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.1-build
2007-03-28 15:47:48 +02:00
jamppa@bk-internal.mysql.com
9685c30214
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-28 15:34:09 +02:00
gkodinov/kgeorge@magare.gmz
c3eb3f7093
Bug #27300 :
...
Geometry fields have a result type string and a
special subclass to cater for the differences
between them and the base class (just like
DATE/TIME).
When creating temporary tables for results of
functions that return results of type GEOMETRY
we must construct fields of the derived class
instead of the base class.
Fixed by creating a GEOMETRY field (Field_geom)
instead of a generic BLOB (Field_blob) in temp
tables for the results of GIS functions that
have GEOMETRY return type (Item_geometry_func).
2007-03-28 14:35:23 +03:00