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
ed698cf596
Fixes to make rpl_user test pass in pushbuild.
2008-02-04 12:22:37 +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
ff40ccb8d7
Masking out some more errors and warnings that are benign.
2008-02-04 07:15:14 +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
mkindahl@dl145h.mysql.com
dc96cb21bf
Removing expected errors from slave from the warnings file.
2008-02-03 18:43:05 +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
064eec03d1
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 20:28:30 +01:00
mkindahl@dl145h.mysql.com
04273b3d5f
Fixes to make tests pass in pushbuild.
2008-02-01 20:26:39 +01:00
cbell/Chuck@mysql_cab_desk.
1ab703f093
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl-merge
...
into mysql_cab_desk.:D:/source/c++/mysql-5.0-rpl-merge
2008-02-01 14:01:21 -05:00
cbell/Chuck@mysql_cab_desk.
7db07f95fb
BUG#32205 : Replaying statements from mysqlbinlog fails with a syntax error, replicates fine
...
This patch adds code to convert the path for LOAD DATA INFILE
events to a Unix path which is needed for running mysql client
on Windows.
2008-02-01 13:11:03 -05:00
mkindahl@dl145h.mysql.com
1e5fa89dde
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 17:57:22 +01:00
mkindahl@dl145h.mysql.com
e00096a1a7
Again blanking out some numbers in file names that is dependent
...
on the context.
2008-02-01 17:26:28 +01:00
mkindahl@dl145h.mysql.com
20a5cc259b
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 15:38:14 +01:00
mkindahl@dl145h.mysql.com
4f7ad14be0
Fixes to make tests pass in pushbuild.
2008-02-01 15:34:34 +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
294571f083
Various fixes to make tests pass on Windows.
2008-02-01 13:18:27 +01:00
mkindahl@dl145h.mysql.com
470b4137ae
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 12:15:23 +01:00
mkindahl@dl145h.mysql.com
cc807b927a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-02-01 12:10:28 +01:00
mkindahl@dl145h.mysql.com
d85f474f75
Committing premature delete (the file will be deleted in a soon-to-come cset).
...
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
strict_autoinc_4bdb.result:
Rename: BitKeeper/deleted/.del-strict_autoinc_4bdb.result -> mysql-test/r/strict_autoinc_4bdb.result
2008-02-01 12:07:17 +01:00
mkindahl@dl145h.mysql.com
5ef8a06c1b
Fixing result files to make tests pass in pushbuild.
2008-02-01 12:00:28 +01:00
mkindahl@bk-internal.mysql.com
8b0091ff53
Deleting Berkeley DB test files since BDB is not distributed with 5.1.
...
.del-bdb_notembedded.test:
Delete: mysql-test/t/bdb_notembedded.test
.del-strict_autoinc_4bdb.result:
Delete: mysql-test/r/strict_autoinc_4bdb.result
.del-bdb_notembedded.result:
Delete: mysql-test/r/bdb_notembedded.result
2008-02-01 11:47:56 +01:00
mkindahl@dl145h.mysql.com
15b74eb7bf
Changes to make tests pass on vanilla build.
2008-02-01 10:46:02 +01: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
mkindahl@dl145h.mysql.com
7cfdd60045
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-31 16:15:46 +01:00
mkindahl@dl145h.mysql.com
2d9c3b715d
Fixes to make tests pass on pushbuild.
2008-01-31 15:53:47 +01: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
mkindahl@dl145h.mysql.com
10b194d272
Changes to fix tests in pushbuild.
2008-01-31 12:17:40 +01:00
mkindahl@dl145h.mysql.com
b8428d1560
Fixes to make code compile on Windows.
2008-01-31 07:19:29 +01:00
mkindahl@dl145h.mysql.com
5367b13823
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 20:29:17 +01:00
mkindahl@dl145h.mysql.com
b9b38cb576
Disabling rpl_transaction test for non-debug builds.
2008-01-30 18:24:28 +01:00
mkindahl@dl145h.mysql.com
7552798971
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 17:46:37 +01:00
mkindahl@dl145h.mysql.com
31355747d2
Fixing return value.
2008-01-30 17:35:25 +01:00
mkindahl@dl145h.mysql.com
2a864d1fd7
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2008-01-30 16:14:14 +01:00
mkindahl@dl145h.mysql.com
59d027c610
.del-show_binlog_events2.inc:
...
Delete: mysql-test/include/show_binlog_events2.inc
2008-01-30 16:11:39 +01:00
mkindahl@dl145h.mysql.com
219a75056a
Post-merge changes.
2008-01-30 16:03:00 +01:00
mkindahl@dl145h.mysql.com
a440007ca4
Changes to make tests pass in pushbuild.
2008-01-30 15:58:35 +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
mkindahl@dl145h.mysql.com
3bcab5899d
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-01-30 12:14:14 +01:00
mkindahl@dl145h.mysql.com
716c63ebaa
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
2008-01-30 11:25:54 +01:00
hezx@mail.hezx.com
afe8ac3128
Merge zhe@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into mail.hezx.com:/media/sda3/work/mysql/bkwork/bug26489_corruption_in_relay_log/5.0
2008-01-30 16:40:36 +08:00
mkindahl@dl145h.mysql.com
9294edeb43
Test changes to fix failures in pushbuild.
2008-01-29 14:43:41 +01:00
hezx@mail.hezx.com
7572a9e391
update test result
2008-01-29 19:21:21 +08:00
hezx@mail.hezx.com
e4f37eab56
BUG#26489 Corruption in relay logs
...
Here is the scenario that causes the failure.(by Mats)
1. The to-be corrupt log event (let's call it X), is split into two
packets B and C on the network level (net_write_buff()). The parts
are X = (x',x''). The part x' ends up in packet B and part x''
ends up in packet C. Prior to the corrupt event X, the event Y has
been written successfully, but has been split into two packets as
well, which we call (y',y'').
2. The master sends packet A = (y'',x') to the slave, increases the
packet sequence number, the slave receives the packet, but fails
to reply before the master gets a timeout.
3. Since the master got a timeout, it reports failure, and aborts
sending the binary log by exiting mysql_binlog_send(). However, it
leaves the buffer intact, still holding y'' (but not x', since the
write_pos is not increased).
4. After exiting mysql_binlog_send(), the master does a
disconnection of the client thread, which involves sending an
error message e to the client (i.e., the slave).
5. In this case, net_write_buff() is used again, but this time the
old contents of the packet is used so that the new packet is
D = (y'',e). Note that this will use a new packet sequence number,
since the packet number was increased in step 2.
6. The slave receives the tail y'' of the Y log event, concatenates
this with x' (which it already received), and writes the event
(x',y'') it to the relay log since it hasn't noticed anything is
amiss.
7. It then tries to read more bytes, which is either e (if the length
given for X just happened to match the length given for Y, or just
plain garbage because the slave is out of sync with what is
actually sent.
8. After a while, the SQL thread tries to execute the event (x',y''),
which is very likely to be just nonsense.
The problem can be fixed by not resetting net->error after the call of
mysql_binlog_send, so the error message will not be sent and the connection
will be closed.
2008-01-29 11:56:48 +08:00
tsmith@ramayana.hindu.god
dbcd4d9ec8
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-27 14:31:49 -07:00
tsmith@ramayana.hindu.god
1bf737a152
Fix test case for Bug #25347 so that it actually tests the code fix,
...
and so that it works correctly on Windows.
2008-01-27 14:28:50 -07:00