summaryrefslogtreecommitdiff
path: root/mysql-test/extra/rpl_tests
Commit message (Expand)AuthorAgeFilesLines
* Merge next-mr -> next-4284.Konstantin Osipov2010-02-067-51/+298
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-127/+0
| |\
| | * Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-127/+0
| | |\
| | | * Revert a patch for Bug#48231, which introduced valgrind warnings.Alexander Nozdrin2010-02-021-127/+0
| | * | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-302-0/+213
| | |\ \ | | | |/
| * | | Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.Alexander Nozdrin2010-02-023-51/+33
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+127
| |\ \ \ | | | |/ | | |/|
| | * | Bug #48321 CURRENT_USER() incorrectly replicated for DROP/RENAME USER;unknown2010-01-301-0/+127
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-311-0/+86
| |\ \ \ | | |/ /
| | * | automerge: mysql-5.1-bugteam branch --> mysql-5.1-bugteam latestLuis Soares2010-01-261-0/+86
| | |\ \
| | | * | BUG#49481: RBR: MyISAM and bit fields may cause slave to stop on delete: Luis Soares2010-01-211-0/+86
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-301-0/+159
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Auto-merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-0/+159
| | |\ \ \ | | | |/ /
| | | * | Bug #49132 Replication failure on temporary table + DDLunknown2010-01-221-0/+159
| | * | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-0/+554
| | |\ \ \ | | | |/ /
| | | * | BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-201-0/+554
| | | |/
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-192-0/+20
| |\ \ \ | | |/ /
| | * | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-152-0/+20
| | |\ \ | | | |/
| | | * BUG#49222: Mark RAND() as unsafeSven Sandberg2010-01-131-0/+6
| | | * merge: 5.1-bugteam bug branch --> 5.1 bugteam latest.Luis Soares2010-01-071-0/+14
| | | |\
| | | | * BUG#49479: Slave stops with syntax error: LOAD DATA event without Luis Soares2009-12-061-0/+14
* | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-0522-495/+5017
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from next-mr.unknown2010-01-121-3/+1
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-1/+145
| |\ \ \ \
| | * | | | BUG#49836: Replication of geometric fields is broken after WL#5151Luis Soares2009-12-241-1/+138
| | * | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-231-0/+7
| | |\ \ \ \
| | | * \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-211-0/+7
| | | |\ \ \ \
| | | | * | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-211-0/+7
| * | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-0722-495/+4808
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-211-0/+28
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merging with mysql.5.1-rep+2Mats Kindahl2009-12-181-17/+16
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merging with mysql-5.1-rep+2Mats Kindahl2009-12-181-0/+28
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | WL#5151: Conversion between different typesMats Kindahl2009-12-181-0/+28
| | * | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-1719-478/+3974
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Post-push fixes after wrong merge from 5.1->rep+2->rep+3.Sven Sandberg2009-12-141-11/+11
| | | * | | | | | merging 5.1->rep+2->rep+3Andrei Elkin2009-12-021-0/+8
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-309-45/+91
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | * | | | | | | Post-fix for WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-132-10/+299
| | | * | | | | | | Post-fix after mysql-5.1-rep+2 --> mysql-5.1-rep+3.Alfranio Correia2009-11-112-15/+178
| | | * | | | | | | Post-fix for merge mysql-5.1-rep+2 --> mysql-5.1-rep+3Alfranio Correia2009-11-111-14/+8
| | | * | | | | | | merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-107-24/+290
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-0314-472/+3109
| | | * | | | | | | | Manual merge 5.1-rep+2 to 5.1-rep+3He Zhenxing2009-10-188-44/+549
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-304-5/+412
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-222-18/+54
| | | | * | | | | | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-144-9/+380
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-144-9/+380
| | * | | | | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Alfranio Correia2009-12-171-17/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | * | | | | | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-154-11/+797
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | / / / | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-144-11/+797