summaryrefslogtreecommitdiff
path: root/mysql-test/extra
Commit message (Expand)AuthorAgeFilesLines
* fix after mergeHe Zhenxing2008-08-141-8/+0
* Auto merge from mysql-5.1 mainHe Zhenxing2008-08-141-0/+4
|\
| * BUG#37733: rpl.rpl_flushlog_loop 'row' fails sporadically on pushbuildSven Sandberg2008-07-231-0/+4
* | Apply tomas's patch to fix rpl_row_basic.test, this can fix BUG#37884, He Zhenxing2008-08-121-24/+44
* | merge 5.1 main -> 5.1-rpl-testfixesSven Sandberg2008-07-291-16/+40
|\ \ | |/ |/|
| * BUG#38068: binlog_stm_binlog fails sporadically in pushbuildSven Sandberg2008-07-231-16/+40
* | Merge 5.1.26-rc to 5.1-build for further pushing it to the main tree.Joerg Bruehe2008-07-111-1/+148
|\ \ | |/ |/|
| * BUG#37426: RBR breaks for CHAR() UTF-8 fields > 85 charsMats Kindahl2008-06-301-1/+148
* | Fixed bug #37076: TIMESTAMP/DATETIME/DATE values are notGleb Shchepa2008-06-191-0/+16
|/
* Fixes to make rpl_insert_id pass in 5.1-bugteam.unknown2008-05-161-7/+8
* BUG#36433: rpl_insert_id detects inconsistency on masterunknown2008-05-151-51/+62
* Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-311-1/+0
|\
| * Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-03-281-1/+0
| |\
| | * BUG#29020 (Event results not correctly replicated to slave in RBR):unknown2008-03-281-1/+0
* | | Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rplunknown2008-03-291-3/+24
|/ /
* | Post-merge fixes.unknown2008-03-142-8/+1
* | Bug #22234 Extra Slave Col: Slave should stop on Error Field `d` of tableunknown2008-03-061-33/+26
|/
* Fix pushbuild errors.unknown2008-02-271-1/+1
* Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-02-201-0/+2
* Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-02-201-0/+1
|\
| * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-mergeunknown2008-02-191-0/+1
| |\
| | * Problem: pushbuild has sporadic errors during startup ofunknown2008-02-111-0/+1
* | | correct merge errorunknown2008-02-141-1/+1
* | | correction of mergeunknown2008-02-131-4/+17
|/ /
* | The test rpl_row_charset and it dependent rpl_ndb_charset isunknown2008-02-132-205/+6
* | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-02-111-0/+17
|\ \ | |/ |/|
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-02-081-0/+17
| |\
| | * Manual merge of Bug 33798unknown2008-02-081-0/+17
* | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rplunknown2008-02-051-3/+3
|\ \ \ | |/ / |/| |
| * | Merge mysql1000.(none):/mnt/nb/home/elkin/MySQL/TEAM/FIXES/5.1/bug32971-error...unknown2008-01-311-3/+3
| |\ \
| | * | Bug #32971 No user level error message from slave sql thread when ER_NO_DEFAU...unknown2008-01-311-3/+3
* | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-mergeunknown2008-02-011-1/+2
* | | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-01-318-24/+407
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2008-01-306-41/+42
| |\ \ \ | | |/ /
| | * | fix test failureunknown2008-01-221-17/+11
| | * | fix failed testsunknown2008-01-212-6/+13
| | * | Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/bug#32205/5.0unknown2008-01-211-0/+1
| | * | Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rplunknown2008-01-141-6/+6
| | |\ \
| | | * | fix for versional testunknown2008-01-141-6/+6
| | * | | Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rplunknown2008-01-143-18/+17
| | |\ \ \ | | | |/ /
| | | * | Fix for versional testunknown2008-01-143-18/+17
| | | |/
| | * | Post-merge fixes to make binlog test suite pass.unknown2008-01-111-4/+14
| * | | Post-merge fixes to make tests pass.unknown2008-01-111-4/+14
| * | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2007-12-194-0/+372
| |\ \ \ | | |/ /
| | * | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2007-12-191-0/+315
| | |/
| | * bug#31552 manual merge and post-make-test-run changes.unknown2007-12-121-0/+5
| | * Merge elkin@aelkin2.mysql.internal:MySQL/TEAM/FIXES/5.1/bug31609-conflict_det...unknown2007-12-123-0/+52
| | |\
| | | * Bug#31552 Replication breaks when deleting rows from out-of-sync tableunknown2007-12-123-0/+52
* | | | Merge host.loc:/home/uchum/work/5.1-opt-33699unknown2008-01-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bug#33699: The UPDATE statement allows NULL as new value on a NOT NULLunknown2008-01-111-1/+1