sven@riska.(none)
4aab65ad5c
Fix pushbuild errors.
2008-02-27 15:18:27 +01:00
mkindahl@dl145h.mysql.com
0b6471da9c
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-27 11:00:43 +01:00
joerg@trift2.
25ab6afc03
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-22 16:14:27 +01:00
msvensson@pilot.mysql.com
d80b1ae384
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-21 14:11:01 +01:00
mkindahl@dl145h.mysql.com
924ff2621e
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-21 09:04:25 +01:00
mkindahl@dl145h.mysql.com
802158bda5
Fixing result after merge.
2008-02-21 06:29:35 +01:00
aelkin/andrei@mysql1000.(none)
49915eb88a
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into mysql1000.(none):/home/andrei/MySQL/FIXES/5.1/bug31316-sss_server_id_clashes
2008-02-20 23:25:01 +02:00
aelkin/andrei@mysql1000.(none)
7e93d94ce5
Bug #31316 Report server id clashes in SHOW SLAVE STATUS
...
"Server_IO_State" field
Critical error messages from get_master_version_and_clock() were written
only to the slave errorlog while Show slave status did not display any
incident happened.
Although the artifact was reported for a particular --replicate-same-server-id
related issue the fix refines all critical error reporting with
deploying rli->report().
The test for the bug covers only --replicate-same-server-id error reporting.
2008-02-20 23:18:01 +02:00
mkindahl@dl145h.mysql.com
759d2f6658
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:49:26 +01:00
mkindahl@dl145h.mysql.com
a71f298f2a
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-20 19:27:06 +01: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
mkindahl@dl145h.mysql.com
482997ea65
Removing deliberately generated errors for rpl_bug33931 test
...
and moving test to replication suite.
2008-02-19 19:59:48 +01:00
mkindahl@dl145h.mysql.com
e8e74a734f
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2008-02-19 14:47:29 +01:00
mkindahl@dl145h.mysql.com
446c3768f5
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-19 11:07:14 +01:00
sven@riska.(none)
4cf7508380
Fixed broken result file.
2008-02-18 15:48:17 +01:00
mkindahl@dl145h.mysql.com
896fceec81
Updating result files.
2008-02-18 15:16:39 +01: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
3f95d153f6
correction of merge
2008-02-13 20:52:01 +01:00
joerg@trift2.
341258dba4
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +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
sven@riska.(none)
5fb3cc65c3
Moved mysql-test/suite/rpl/rpl_variables.test into
...
mysql-test/t/variables.test, because:
- mysql-test/suite/rpl/t/rpl_variables.test does not replicate anything,
so should not be in the rpl suite.
- mysql-test/t/variables.test is the place for testing variable-related
problems and features.
- I will soon commit a patch containing a test case that tests
replication of variables. It would be good if I could call the test case
mysql-test/suite/rpl/t/rpl_variables.test. I'm making place for that now.
2008-02-12 17:22:04 +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
hhunger@hh-nb.hungers
159bc5c73b
Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean
...
into hh-nb.hungers:/work/merge/mysql-5.1-build
2008-02-07 20:31:15 +01: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
hhunger@hh-nb.hungers
23ebccac7e
Fixed differences in STATE in result file for bug#34190.
2008-02-06 11:02:45 +01:00
tsmith@ramayana.hindu.god
c99d06a5f3
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:15:07 -07: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