mkindahl@dl145h.mysql.com
0c7f3bdeba
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
2007-11-21 21:15:33 +01:00
jmiller/root@ndbqa01.mysql.com
1a7bf0c630
Merge mysql.com:/usr/clones/mysql-5.1-new-rpl
...
into mysql.com:/usr/clones/rpl-push
2007-10-30 10:02:37 -05:00
gshchepa/uchum@gleb.loc
6fbac59c5c
Many files:
...
Error message numbers.
2007-10-27 01:40:48 +05: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
mats@kindahl-laptop.dnsalias.net
f2ba11c327
BUG#28618 (Skipping into the middle of a group with SQL_SLAVE_SKIP_COUNTER
...
is possible):
When skipping the beginning of a transaction starting with BEGIN, the OPTION_BEGIN
flag was not set correctly, which caused the slave to not recognize that it was
inside a group. This patch sets the OPTION_BEGIN flag for BEGIN, COMMIT, ROLLBACK,
and XID events. It also adds checks if inside a group before decreasing the
slave skip counter to zero.
Begin_query_log_event was not marked that it could not end a group, which is now
corrected.
2007-10-19 14:18:41 +02:00
gshchepa@devsrv-b.mysql.com
ca15f7b190
Many files:
...
Merge with 5.0-opt.
2007-09-14 17:21:50 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
aba3a3b49d
Post-merge fix of error number
2007-08-16 17:26:32 +02:00
lars/lthalmann@dl145k.mysql.com
2c893c14da
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-08-15 21:30:45 +02:00
cbell/Chuck@mysql_cab_desk.
e8ea4b84c0
BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash
...
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.
It also includes some refactoring for the code from WL#3228.
2007-08-10 12:48:01 -04:00
gkodinov/kgeorge@magare.gmz
e53af13d1e
rpl_row_tabledefs_2myisam.result:
...
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
merged 5.1-main to 5.1-opt : error numbers changed
2007-08-05 14:02:33 +03:00
tsmith@sita.local
5f12f35c34
Merge sita.local:/Users/tsmith/m/bk/51
...
into sita.local:/Users/tsmith/m/bk/maint/51
This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.
2007-07-09 03:27:03 -06:00
msvensson@pilot.(none)
2238ef2b62
Merge pilot.(none):/data/msvensson/mysql/wl3933/my51-wl3933-new2
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-27 14:29:10 +02:00
msvensson@pilot.(none)
8661497e9b
WL#3933 Split main test suite to rpl, rpl_ndb and ndb
...
- Update mysql-test-run.pl to collect tests from several suites
- Group test into suites
- Add suite.opt file
2007-06-27 14:28:02 +02:00