tomas@poseidon.bredbandsbolaget.se
be0324b005
correct manual merge
2008-02-13 23:10:47 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6
correction of merge
2008-02-13 20:52:01 +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
tomas@poseidon.ndb.mysql.com
5cdbd24da0
corrected really strange test
2008-02-12 14:50:36 +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
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
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
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
davi@mysql.com/endora.local
15409e87d2
Manual merge of Bug 33798
2008-02-08 10:47:25 -02:00
mkindahl@dl145h.mysql.com
4ab85233d2
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-07 12:38:13 +01:00
mkindahl@dl145h.mysql.com
1fe2245f5d
Renaming some saved binary log files to avoid 99 characters
...
limit for v7 tar.
2008-02-07 12:30:52 +01:00
tomas@whalegate.ndb.mysql.com
7376f136e8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-02-06 16:16:49 +01:00
msvensson@pilot.mysql.com
638eb55307
Merge bk-internal:/home/bk/mysql-5.1-new-ndb
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb
2008-02-06 14:38:08 +01:00
mkindahl@dl145h.mysql.com
d4720a4ea1
Updating result file for rpl_loaddata_map.
2008-02-05 19:44:16 +01:00
mkindahl@dl145h.mysql.com
5543a5bda0
Fixes to make tests pass on vanilla build.
2008-02-05 17:05:59 +01:00
mkindahl@dl145h.mysql.com
7e0f4a6fa7
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-05 14:52:20 +01:00
mkindahl@dl145h.mysql.com
6c6c278e0c
Disabling test case binlog_old_version for embedded server.
2008-02-05 08:22:27 +01:00
sven@riska.(none)
a25028ef64
Merge riska.(none):/home/sven/bktip/5.1-new-rpl
...
into riska.(none):/home/sven/bk/b34141-mysqlbinlog_4.1_binlogs/5.1-new-rpl
2008-02-04 14:37:34 +01:00
mkindahl@dl145h.mysql.com
1dc96b388e
Fixing result change after merge.
2008-02-04 14:29:23 +01:00
mkindahl@dl145h.mysql.com
1604acd9bf
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-04 12:33:28 +01:00
mkindahl@dl145h.mysql.com
d6fd94f77b
More fixes to remove test failures in pushbuild.
2008-02-04 12:12:03 +01:00
mkindahl@dl145h.mysql.com
ec9d14f844
Yet more changes to fix the merge clone.
2008-02-04 08:43:22 +01:00
mkindahl@dl145h.mysql.com
e493906588
Minor fix to make rpl_loaddata_map pass without warnings.
2008-02-04 06:49:15 +01:00
jonas@perch.ndb.mysql.com
9fa1b08faa
ndb - bug#33619
...
make sure to alloc logspace and set bits
if doing delete after previous update wo/ touching DD part
2008-02-03 21:24:59 +01:00
mkindahl@dl145h.mysql.com
221ef88c6a
Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
...
exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
'mysql/ndb_apply_status'
Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.
2008-02-03 11:48:45 +01:00
mkindahl@dl145h.mysql.com
c35112de8c
Disabling various tests and reporting bugs for them.
2008-02-02 08:15:36 +01:00
mkindahl@dl145h.mysql.com
04273b3d5f
Fixes to make tests pass in pushbuild.
2008-02-01 20:26:39 +01:00
mkindahl@dl145h.mysql.com
7abc1dda10
Fixes to makes tests pass on Windows and vanilla build.
2008-02-01 14:27:23 +01:00
mkindahl@dl145h.mysql.com
74afc4afa7
Re-creating binlog_start_comment.test to make sure that changes
...
are propagated from earlier versions.
2008-02-01 13:49:28 +01:00
mkindahl@dl145h.mysql.com
22affb3326
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 13:28:11 +01:00
mkindahl@dl145h.mysql.com
5ef8a06c1b
Fixing result files to make tests pass in pushbuild.
2008-02-01 12:00:28 +01:00
hezx@mail.hezx.com
4371a7888d
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug33862_failed_drop_user/5.1
2008-02-01 10:27:03 +08:00
mkindahl@dl145h.mysql.com
4c95b29614
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 17:46:50 +01:00
aelkin/andrei@mysql1000.(none)
8e45696765
bug#32971 manual merge of two tests results
2008-01-31 18:12:58 +02:00
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01:00
pekka@sama.ndb.mysql.com
1ccf00f00a
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107
2008-01-31 14:47:50 +01:00
skozlov/ksm@mysql.com/virtop.(none)
7a82a059a9
Test case for bug#12691
2008-01-31 16:23:27 +03:00
mkindahl@dl145h.mysql.com
6aacc6415a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-31 12:32:48 +01:00
hezx@mail.hezx.com
43c4a4c359
Post merge fix
2008-01-31 16:51:55 +08:00
tomas@whalegate.ndb.mysql.com
07fafa2b61
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2008-01-30 16:08:25 +01:00
sven@riska.(none)
30cd549e3b
BUG#34141: mysqlbinlog cannot read 4.1 binlogs containing load data infile
...
Main problem: mysql 5.1 cannot read binlogs from 4.1.
Subproblem 1: There is a mistake in sql_ex_info::init. The read_str()
function updates its first argument to point to the next character to
read. However, it is applied only to a copy of the buffer pointer, so the
real buffer pointer is not updated.
Fix 1: do not take a copy of the buffer pointer. The copy was needed
because sql_ex_info::init does not use the const attribute on some of its
arguments. So we add the const attribute, too.
Subproblem 2: The first BINLOG statement is asserted to be a
FORMAT_DESCRIPTION_LOG_EVENT, but 4.1 binlogs begin with START_EVENT_V3.
Fix 2: allow START_EVENT_V3 too.
2008-01-30 14:12:40 +01:00
mkindahl@dl145h.mysql.com
018cb16b3a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 12:53:33 +01:00
pekka@sama.ndb.mysql.com
6131fa098f
Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34118
2008-01-29 15:30:46 +01:00