svoj@june.mysql.com
6c6afd7130
Merge mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.1-engines
2008-02-27 17:43:54 +04:00
svoj@june.mysql.com
44340d9388
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG13861/mysql-5.0-engines
2008-02-27 17:33:19 +04:00
mattiasj@witty.
2e3ed6a216
Post push fix
...
Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.
2008-02-25 21:18:50 +01:00
mattiasj@witty.
eaac5d5f3a
Pre push fixes
...
Test file fixes for bugs 20129, 31931 and 34225
2008-02-24 19:13:18 +01:00
mattiasj@witty.
2bf256f8dd
Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug20129.2
...
into witty.:/Users/mattiasj/clones/topush-51
2008-02-24 17:48:57 +01:00
mattiasj@witty.
d3937fd63c
Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug31931.2
...
into witty.:/Users/mattiasj/clones/topush-51
2008-02-24 16:46:35 +01:00
svoj@mysql.com/june.mysql.com
fe3b1c8e25
BUG#13861 - START SLAVE UNTIL may stop 1 evnt too late if
...
log-slave-updates and circul repl
Slave SQL thread may execute one extra event when there are events
skipped by slave I/O thread (e.g. originated by the same server).
Whereas it was requested not to do so by the UNTIL condition.
This happens because we compare with the end position of previously
executed event. This is fine when there are no skipped by slave I/O
thread events, as end position of previous event equals to start
position of to be executed event. Otherwise this position equals to
start position of skipped event.
This is fixed by:
- reading the event to be executed before checking if the until condition
is satisfied.
- comparing the start position of the event to be executed. Since we do
not have the start position available, we compute it by subtracting
event length from end position (which is available).
- if there are no events on the event queue at the slave sql starting
time, that meet until condition, we stop immediately, as in this
case we do not want to wait for next event.
2008-02-22 19:07:07 +04:00
acurtis/antony@ltamd64.xiphis.org
7401475dcd
Merge xiphis.org:/anubis/antony/work/mysql-5.1-engines
...
into xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.1
2008-02-20 22:47:08 -08:00
acurtis/antony@ltamd64.xiphis.org
9ed3da2c12
Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines
...
into xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0
2008-02-20 22:42:24 -08:00
svoj@june.mysql.com
33ad5a480f
Merge mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.1-engines
2008-02-20 21:22:21 +04:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
d2ad8286a0
backport valgrind cleanups from 6.0-engines
2008-02-19 13:46:54 -08:00
tomas@poseidon.bredbandsbolaget.se
50d95649f7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-19 20:56:14 +01:00
svoj@mysql.com/june.mysql.com
921e1cc4bb
BUG#34289 - Incorrect NAME_CONST substitution in stored procedures
...
breaks replication
NAME_CONST() didn't replicate constant character set and collation
correctly.
With this fix NAME_CONST() inherits collation from the value argument.
2008-02-19 18:16:17 +04:00
istruewing@stella.local
4bbbd57c81
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-15 20:44:33 +01:00
mkindahl@dl145h.mysql.com
a1a94e238f
Adding waits to events_scheduling to prevent the test from
...
failing on heavily loaded systems.
2008-02-15 10:24:13 +01:00
istruewing@stella.local
108013f6a7
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 21:00:10 +01:00
istruewing@stella.local
6c977025df
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 20:24:01 +01:00
istruewing@stella.local
9a4d57e319
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:53:03 +01:00
istruewing@stella.local
fb20c9dd5e
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:51:41 +01:00
istruewing@stella.local
b6c8f8a58b
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 16:14:30 +01:00
svoj@april.(none)
2ab1b8406e
Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
2008-02-14 16:47:46 +04:00
svoj@mysql.com/april.(none)
7fa875e42b
BUG#33946 - Join on Federated tables with Unique index gives error 1430
...
from storage engine
Federated may crash a server, return wrong result set, return
"ERROR 1030 (HY000): Got error 1430 from storage engine" message
when local (engine=federated) table has a key against nullable
column.
The problem was wrong implementation of function that creates
WHERE clause for remote query from key.
2008-02-14 16:27:01 +04:00
mkindahl@dl145h.mysql.com
fd5d7fa761
Fixing test rpl_events to not give false failures.
2008-02-14 10:53:12 +01:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf
correct merge error
2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005
correct manual merge
2008-02-13 23:10:47 +01:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed
Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge
...
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6
correction of merge
2008-02-13 20:52:01 +01:00
mkindahl@dl145h.mysql.com
32853b9fa5
Removing non-deterministic tests from events_scheduling test.
2008-02-13 12:41:54 +01:00
tomas@poseidon.ndb.mysql.com
f9a38a9e4e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-13 12:36:57 +01:00
mkindahl@dl145h.mysql.com
b1fadc4cf9
The test rpl_row_charset and it dependent rpl_ndb_charset is
...
irrelevant to execute since the charset information does not
affect replication for row-based replication. The row-based
versions of the tests were removed, and the statement-based
version of the test was made executable by all three modes.
This involves removing any lines that causes the test to be
dependent on the contents of the binary log, and instead we
just check that the replication works as it should.
2008-02-13 11:37:06 +01:00
mikael@dator6.(none)
e1820b2e77
Merge dator6.(none):/home/mikael/mysql_clones/bug32943
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:29:50 +01:00
tomas@poseidon.ndb.mysql.com
5cdbd24da0
corrected really strange test
2008-02-12 14:50:36 +01:00
tomas@poseidon.ndb.mysql.com
a4d8864b5e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-rpl-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-12 11:22:07 +01:00
tomas@poseidon.ndb.mysql.com
3a142141ec
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-rpl-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-12 11:21:05 +01:00
mkindahl@dl145h.mysql.com
83dac31180
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-11 18:10:56 +01:00
mkindahl@dl145h.mysql.com
3afb341aaf
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1
2008-02-11 17:57:02 +01:00
tomas@poseidon.ndb.mysql.com
832b498e72
Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-11 17:38:34 +01:00
tomas@poseidon.ndb.mysql.com
3103c2fb8c
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-11 17:37:25 +01:00
tomas@poseidon.ndb.mysql.com
fe364e4c2d
default changed not to run idempotent, but test requires it because of how ndb logs updates as write
2008-02-11 15:26:38 +01:00
tomas@poseidon.ndb.mysql.com
93e218990f
correcting wrong test case
2008-02-11 15:06:07 +01:00
anozdrin/alik@quad.
301ab0d8b7
Disable sporadically failing test cases (Bug#34454).
2008-02-11 14:34:53 +03:00
istruewing@stella.local
16be963007
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:07:19 +01:00
istruewing@stella.local
d59ee3db2d
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 11:58:23 +01:00
mattiasj@client-10-129-10-147.upp.off.mysql.com
2335bfaa5b
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
...
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
2008-02-11 11:32:46 +01:00
istruewing@stella.local
21534505d0
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-11 11:19:06 +01:00
sven@riska.(none)
41bb462652
Problem: pushbuild fails in embedded mode on test binlog_base64_flag
...
because it uses BINLOG statement, which is not supported in embedded mode.
Fix: disable the test in embedded mode.
2008-02-09 19:43:32 +01:00
sven@riska.(none)
d1963d066b
BUG#33247: mysqlbinlog does not clean up after itself on abnormal termination
...
Problem: mysqlbinlog does not free memory if an error happens.
Fix: binlog-processing functions do not call exit() anymore. Instead, they
print an error and return an error code. Error codes are propagated all
the way back to main, and all allocated memory is freed on the way.
2008-02-08 18:17:00 +01:00
anozdrin/alik@quad.
dbe77333d5
Bug#34424: query_cache_debug.test leads to valgrind warnings
...
Disable the test case.
2008-02-08 20:07:39 +03:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00