bar@bar.myoffice.izhnet.ru
e89e78d101
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
2007-10-24 12:09:24 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
5cfd557fad
Bug#31081 server crash in regexp function
...
Additional fix for valgrind warning
2007-10-24 12:08:33 +05:00
bar@bar.myoffice.izhnet.ru
811e64de62
Merge mysql.com:/home/bar/mysql-work/mysql-5.0
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
2007-10-24 10:49:46 +05:00
gluh@mysql.com/eagle.(none)
b2aeda7699
result fix
2007-10-23 20:12:50 +05:00
gluh@eagle.(none)
d639739022
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 20:11:39 +05:00
gluh@eagle.(none)
53b1c3a299
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 20:09:36 +05:00
gluh@mysql.com/eagle.(none)
1d42094d18
after merge fix
2007-10-23 19:28:47 +05:00
gluh@eagle.(none)
17acda6ca8
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 19:08:21 +05:00
gluh@eagle.(none)
237383f0fe
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-10-23 18:51:43 +05:00
gluh@eagle.(none)
331ee71261
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-10-23 18:47:18 +05:00
holyfoot/hf@hfmain.(none)
d0f53297f6
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 17:24:57 +05:00
kaa@polly.(none)
173108956a
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:24:56 +04:00
holyfoot/hf@hfmain.(none)
f71a1441ee
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 17:09:32 +05:00
kaa@polly.(none)
6f1aef60ed
Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:09:31 +04:00
kaa@polly.(none)
6832d2cc1b
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.1-opt
2007-10-23 16:07:03 +04:00
gkodinov/kgeorge@magare.gmz
9934eec243
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 15:04:40 +03:00
kaa@polly.(none)
23c65a3b01
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/mysql-5.0-opt
2007-10-23 16:03:48 +04:00
kaa@polly.(none)
17a533e0d0
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
...
into polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
2007-10-23 15:52:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
d029dd89c1
type conversions fixed to get rid of warnings
2007-10-23 16:32:05 +05:00
holyfoot/hf@hfmain.(none)
05f918e999
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:52 +05:00
holyfoot/hf@hfmain.(none)
9b61281c01
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:28:51 +05:00
gkodinov/kgeorge@magare.gmz
58bce232a8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
2007-10-23 14:28:50 +03:00
gkodinov/kgeorge@magare.gmz
7ac179bc34
merge 5.0-opt -> 5.1-opt for bug 30825
2007-10-23 14:26:57 +03:00
gkodinov/kgeorge@magare.gmz
bc80b86379
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 14:23:18 +03:00
holyfoot/hf@hfmain.(none)
c3033ace1f
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 16:21:51 +05:00
gkodinov/kgeorge@magare.gmz
7c344185bd
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
2007-10-23 14:21:50 +03:00
holyfoot/hf@hfmain.(none)
14c43b980e
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 15:35:52 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
36092b373a
type conversion fixed to get rid of warnings
2007-10-23 15:34:10 +05:00
gkodinov/kgeorge@magare.gmz
62737d6d42
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 13:10:35 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
7c8d8b5a74
merging
2007-10-23 14:31:59 +05:00
holyfoot/hf@hfmain.(none)
7fe41df000
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-23 14:31:24 +05:00
holyfoot/hf@hfmain.(none)
0353ecb29f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 14:30:22 +05:00
holyfoot/hf@hfmain.(none)
2a7ae86a35
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-23 14:29:20 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
9f323e1a3a
type conversions fixed to avoid warnings on Windows
2007-10-23 14:27:11 +05:00
gluh@mysql.com/eagle.(none)
29ea825e57
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/4.1-opt
2007-10-23 14:06:56 +05:00
gkodinov/kgeorge@magare.gmz
3553f6eac2
Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt
2007-10-23 11:44:14 +03:00
gkodinov/kgeorge@magare.gmz
d066e2173c
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
2007-10-23 11:26:37 +03:00
gkodinov/kgeorge@magare.gmz
0a14d1a19b
Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt
2007-10-23 11:22:59 +03:00
gluh@mysql.com/eagle.(none)
ffea2073b1
Bug#31633 Information schema = NULL queries crash the server
...
added correct handling of NULL values for lookup fields
2007-10-23 13:20:51 +05:00
aelkin/elkin@koti.dsl.inet.fi
271c98d067
Bug #30594 rpl.rpl_skip_error is nondeterministic
...
Non-determinism in the tests was due to results of SBR are different from those gained
with row binlog format.
Because tests effectively verify skipping only ER_DUP_ENTRY it is explicitly required
to run the test on in mixed and stmt binlog format.
ER_DUP_ENTRY is automatically ignored when happened in RBR because of implicit rule
favoring reentrant reading from binlog rule
which means that a Write_rows_log_event overwrites a slave's row
if the one has the same primary key.
If future we might have skipping error due to applying of row-based events.
The comments added saying a new file would be needed for that: rpl_row_skip_error or smth.
2007-10-22 21:45:21 +03:00
gkodinov/kgeorge@magare.gmz
52b35112cf
Bug #28687 : Search fails on '0000-00-00' date after sql_mode change
...
When doing indexed search the server constructs a key image for
faster comparison to the stored keys. While doing that it must not
perform (and stop if they fail) the additional date checks that can
be turned on by the SQL mode because there already may be values in
the table that don't comply with the error checks.
Fixed by ignoring these SQL mode bits while making the key image.
2007-10-22 19:32:18 +03:00
kaa@polly.(none)
53a9e7f478
Fix for bug #31742 : delete from ... order by function call that causes
...
an error, asserts server
In case of a fatal error during filesort in find_all_keys() the error
was returned without the necessary handler uninitialization.
Fixed by changing the code so that handler uninitialization is performed
before returning the error.
2007-10-22 16:10:08 +04:00
mats@kindahl-laptop.dnsalias.net
b65a9888c0
Post-merge fixes.
2007-10-22 10:32:35 +02:00
mats@kindahl-laptop.dnsalias.net
105a9c3e67
Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
...
into kindahl-laptop.dnsalias.net:/home/bk/b28618-mysql-5.1-rpl
2007-10-22 08:50:08 +02:00
holyfoot/hf@hfmain.(none)
9e6091fcbc
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:30:09 +05:00
holyfoot/hf@hfmain.(none)
f5bc9d3c82
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:28:12 +05:00
holyfoot/hf@hfmain.(none)
5b67dca442
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-22 10:27:35 +05:00
holyfoot/hf@hfmain.(none)
bf19259d83
Merge mysql.com:/home/hf/work/29801/my50-29801
...
into mysql.com:/home/hf/work/30638/my50-30638
2007-10-22 10:26:16 +05:00
holyfoot/hf@hfmain.(none)
f4785845b4
Merge mysql.com:/home/hf/work/29801/my51-29801
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:25:35 +05:00
holyfoot/hf@hfmain.(none)
0065b7800e
Merge mysql.com:/home/hf/work/30638/my50-30638
...
into mysql.com:/home/hf/work/30638/my51-30638
2007-10-22 10:24:12 +05:00
