summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-21646-12097/+95592
|\
| * Removes duplicate entry for ER_SLAVE_IGNORE_SERVER_IDSLuis Soares2010-01-201-2/+0
| * Add client/dtoa.c to .bzrignore.Alexander Nozdrin2010-01-201-0/+1
| * Mark several failing test cases experimental.Alexander Nozdrin2010-01-201-0/+12
| * Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2010-01-191-1/+14
| |\
| | * Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-18352-11455/+56198
| | |\
| | * | Fix for Bug#50221 Server refuses to start from non-default installdir on Sola...Olav Sandstaa2010-01-141-1/+14
| | * | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-14287-625/+27087
| | |\ \
| | * \ \ Auto-merge (empty) from mysql-next-mr.Alexander Nozdrin2010-01-120-0/+0
| | |\ \ \
| * | \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2010-01-18352-11455/+56198
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Enable sys_vars and perfschema test suitesAlexander Nozdrin2010-01-182-6/+6
| | * | | | Auto-merge from mysql-5.1-rpl-merge.Alexander Nozdrin2010-01-18350-11449/+56192
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix for perfschema.binlog_stmt failure:unknown2010-01-155-52/+62
| | | * | | Removed garbage from the mysqld--help-winAlfranio Correia2010-01-141-1/+0
| | | * | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-142-7/+63
| | | |\ \ \
| | | | * \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2010-01-142-7/+63
| | | | |\ \ \
| | | | | * | | Augmented the rpl_ndb_binlog_format_errors to verify if a slave running in theAlfranio Correia2010-01-142-7/+63
| | | * | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-14286-617/+27080
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Disabled binlog_unsafe due to BUG#50312.Luis Soares2010-01-131-0/+1
| | | * | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-132-12/+31
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merging with mysql-5.1-rep+2-delivery1Mats Kindahl2010-01-131-1/+2
| | | | |\ \ \ \
| | | | | * | | | Replacing error variable that was lost.Mats Kindahl2010-01-131-1/+2
| | | | * | | | | Merging with mysql-5.1-rep+2-delivery1Mats Kindahl2010-01-132-14/+32
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | WL#5151: Conversion between different types whenMats Kindahl2010-01-132-21/+46
| | | * | | | | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-13166-2417/+5712
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Makes slave_type_conversions_basic to be skipped in embeddedLuis Soares2010-01-131-0/+2
| | | * | | | | | Fixes two remaining test failures:Luis Soares2010-01-133-454/+1
| | | * | | | | | Fixes one more failure in gcov run:Luis Soares2010-01-121-0/+3
| | | * | | | | | Fixes for three test failures:Luis Soares2010-01-125-2/+56
| | | * | | | | | Auto merge.unknown2010-01-122-0/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Fixes rpl_stm_loaddata_concurrent failure in PB2.Luis Soares2010-01-082-0/+2
| | | * | | | | | | Manual merge from next-mr.unknown2010-01-12813-16646/+20617
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-0715-104/+534
| | | |\ \ \ \ \ \ \ | | | | | |_|/ / / / | | | | |/| | | | |
| | | | * | | | | | Fix for rpl_bug31076 valgrind failure which popped up afterLuis Soares2010-01-071-1/+8
| | | | * | | | | | merge 5.1-rep+3 --> 5.1-rep+2-delivery1Alfranio Correia2010-01-057-101/+102
| | | | |\ \ \ \ \ \ | | | | | | |_|_|/ / | | | | | |/| | | |
| | | | | * | | | | BUG#50038 Deadlock on flush logs with concurrent DML and RBRAlfranio Correia2010-01-057-101/+102
| | | | * | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-289-106/+501
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == ramil@mysql.com-20...Alfranio Correia2009-12-279-106/+501
| | | | | |\ \ \ \ \ \
| | | | * | | | | | | | Valgrind warnings that have poped up ever since WL#5151 was pushed.Luis Soares2009-12-241-1/+1
| | | | * | | | | | | | BUG#49836: Replication of geometric fields is broken after WL#5151Luis Soares2009-12-244-5/+211
| | | | * | | | | | | | merge mysql-5.1-rep+2 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-233-0/+15
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-213-0/+15
| | | | | |\ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / | | | | | | |/| | | | |
| | | | | | * | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-213-0/+15
| | | | * | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-234-0/+198
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / | | | | | |/| | | | | |
| | | | | * | | | | | | Bug #47863 binlog_format should be writable only at transaction boundariesunknown2009-12-234-0/+198
| | | * | | | | | | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-07336-11418/+55627
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Fixing tree_name.Luis Soares2009-12-221-1/+1
| | | | * | | | | | | | PB2 was showing some valgrind warnings after WL#5151 was pushed.Luis Soares2009-12-224-8/+8
| | | | * | | | | | | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-213-2/+19
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Post-merge fix.Alfranio Correia2009-12-211-0/+4