svoj@mysql.com/april.(none)
e11d75e45b
BUG#29445 - match ... against () never returns
...
Part 2:
Searching fulltext index for a word with boolean mode truncation
operator may cause infinite loop.
The problem was that "smarter index merge" was used with "trunc-words",
which must never happen.
Affects 5.1 only.
2007-07-13 03:25:27 +05:00
serg@janus.mylan
859304f708
fix for smarter index mergein fulltext
...
to work for queries like "+a (b)"
2007-07-11 15:26:19 +02:00
svoj@june.mysql.com
05a12b7bb7
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29445/mysql-5.1-engines
2007-07-11 15:58:08 +05:00
svoj@mysql.com/june.mysql.com
31c8efc812
BUG#29445 - match ... against () never returns
...
Part 1:
Do not perform index search for a plus-word with truncation operator
in case there are other plus-words in expression.
Specifically this optimization was enforced for expression like
"+word1 +word2*", but wasn't enforced for expression like
"+word1 word2*".
2007-07-10 15:37:39 +05:00
istruewing@chilla.local
4b76695000
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-09 16:06:09 +02:00
svoj@june.mysql.com
c188110565
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG29464/mysql-5.1-engines
2007-07-09 16:07:08 +05:00
istruewing@chilla.local
043cf5bb4a
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:44:47 +02:00
istruewing@chilla.local
22ad965856
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:43:39 +02:00
istruewing@chilla.local
660c3fd239
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-08 22:41:49 +02:00
istruewing@chilla.local
f5fcc9de33
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:04:54 +02:00
istruewing@chilla.local
246d1d43cb
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:04:08 +02:00
istruewing@chilla.local
cb88f63e75
Merge chilla.local:/home/mydev/mysql-5.0-ateam
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-07-08 21:03:02 +02:00
istruewing@chilla.local
10441bc78a
Merge chilla.local:/home/mydev/mysql-4.1-amain
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-08 19:47:08 +02:00
istruewing@chilla.local
cf016f84fa
Merge chilla.local:/home/mydev/mysql-4.1-ateam
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-07-08 19:46:22 +02:00
gshchepa/uchum@gleb.loc
eac626bde6
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 11:51:09 +05:00
gshchepa/uchum@gleb.loc
930f711b8f
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 11:48:57 +05:00
gshchepa/uchum@gleb.loc
b1d230e09f
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-08 11:46:52 +05:00
igor@olga.mysql.com
4d8e0fb50a
Post-merge fix.
2007-07-07 20:03:00 -07:00
igor@olga.mysql.com
e06c67443d
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
2007-07-07 17:29:19 -07:00
igor@olga.mysql.com
e1eababbba
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417
2007-07-07 15:45:28 -07:00
gshchepa/uchum@gleb.loc
6aa9e3a4fc
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-08 03:40:01 +05:00
gshchepa/uchum@gleb.loc
cb86f26d79
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 03:30:27 +05:00
gshchepa/uchum@gleb.loc
33b64dc989
Merge gleb.loc:/home/uchum/work/bk/4.1-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-08 03:25:39 +05:00
gshchepa/uchum@gleb.loc
e5e750c3c9
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-08 01:27:07 +05:00
igor@olga.mysql.com
63d538575b
Fixed bug #29417 .
...
An assertion abort could occur for some grouping queries that employed
decimal user variables with assignments to them.
The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.
2007-07-07 12:31:55 -07:00
gshchepa/uchum@gleb.loc
3c918268e7
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-08 00:19:31 +05:00
gshchepa/uchum@gleb.loc
8c8b64797a
Merge gleb.loc:/home/uchum/work/bk/4.1
...
into gleb.loc:/home/uchum/work/bk/4.1-opt
2007-07-08 00:15:53 +05:00
igor@olga.mysql.com
87c3d18f6f
Fixed bug #29415 .
...
The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.
Fixed by throwing errors for such cases.
2007-07-07 10:33:02 -07:00
antony@ppcg5.local
8fe7320f46
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-07-07 09:45:43 -07:00
antony@ppcg5.local
6cb186883f
disable federated_innodb test until bug29522 is fixed
2007-07-07 09:28:35 -07:00
gshchepa/uchum@gleb.loc
e657075fcb
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-07 20:14:06 +05:00
knielsen@ymer.(none)
e9f7bfd69d
Merge ymer.(none):/usr/local/mysql/mysql-5.0-engines
...
into ymer.(none):/usr/local/mysql/mysql-5.1-engines
2007-07-07 07:48:43 +02:00
knielsen@ymer.(none)
db649ad5d1
Bug #29543 GCov information not written in case of crash.
...
For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.
Fix this by explicitly calling the __gcov_flush function in our crash handler.
2007-07-07 07:46:17 +02:00
antony@ppcg5.local
b43f78edf9
Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 14:52:18 -07:00
antony@ppcg5.local
a6f9981ebd
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 14:33:14 -07:00
antony@ppcg5.local
edc4f4b3a6
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
2007-07-06 14:29:58 -07:00
antony@ppcg5.local
ab4101d62f
Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 11:39:55 -07:00
antony@ppcg5.local
1988c1c668
fix test for bug29299
2007-07-06 11:35:10 -07:00
antony@ppcg5.local
c2b6cb288b
Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.1-engines.merge
2007-07-06 09:07:08 -07:00
antony@ppcg5.local
6402e4324a
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge
2007-07-06 09:03:50 -07:00
antony@ppcg5.local
4632a1c44b
Merge ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-4.1-engines.merge
...
into ppcg5.local:/private/Network/Servers/anubis.xiphis.org/home/antony/work/mysql-5.0-engines.merge
2007-07-06 09:02:36 -07:00
antony@ppcg5.local
2b52524ea5
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-5.0-engines.merge
2007-07-06 09:00:40 -07:00
antony@ppcg5.local
bab42982bc
Merge anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines
...
into anubis.xiphis.org:/usr/home/antony/work/mysql-4.1-engines.merge
2007-07-06 08:57:18 -07:00
jani@labbari.dsl.inet.fi
12a7af3728
Merge labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
...
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.1-marvel
2007-07-06 13:49:15 +03:00
jani@labbari.dsl.inet.fi
7d7524d94d
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into labbari.dsl.inet.fi:/home/my/bk/mysql-5.0-marvel
2007-07-06 09:51:02 +03:00
igor@olga.mysql.com
5b1e1eeae5
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29392
2007-07-05 17:39:51 -07:00
gshchepa/uchum@gleb.loc
0b00ebbba0
Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-06 03:49:40 +05:00
gshchepa/uchum@gleb.loc
c33f4d3d85
Fixed bug #29442 .
...
The SELECT INTO OUTFILE FIELDS ENCLOSED BY digit or minus sign,
followed by the same LOAD DATA INFILE statement, used wrond encoding
of non-string fields contained the enclosed character in their text
representation.
Example:
SELECT 15, 9 INTO OUTFILE 'text' FIELDS ENCLOSED BY '5';
Old encoded result in the text file:
5155 595
^ was decoded as the 1st enclosing character of the 2nd field;
^ was skipped as garbage;
^ ^ was decoded as a pair of englosing characters of the 1st field;
^ was decoded as traling space of the first field;
^^ was decoded as a doubled enclosed character.
New encoded result in the text file:
51\55 595
^ ^ pair of enclosing characters of the 1st field;
^^ escaped enclosed character.
2007-07-06 03:43:23 +05:00
istruewing@chilla.local
3a9a886aec
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-05 22:28:34 +02:00
istruewing@chilla.local
6be5866725
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-07-05 22:27:05 +02:00