| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 2 | -9/+6 |
| |\ |
|
| | * | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_events | Sergei Golubchik | 2011-09-23 | 1 | -6/+6 |
| | * | Merge with 5.2 | Michael Widenius | 2011-09-15 | 1 | -18/+9 |
| | |\ |
|
| | | * | Fixed race condition that could cause diff to fail. | Michael Widenius | 2011-09-15 | 1 | -18/+9 |
| * | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 4 | -75/+92 |
| |\ \ \ |
|
| | * | | | BUG#11758262 - 50439: MARK INSERT...SEL...ON DUP KEY UPD,REPLACE...SEL,CREATE... | Rohit Kalhans | 2011-09-29 | 3 | -74/+65 |
| | * | | | BUG#11809016 - NO WAY TO DISCOVER AN INSTANCE IS NO LONGER A SLAVE FOLLOWING ... | Alfranio Correia | 2011-07-18 | 1 | -1/+27 |
| * | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 11 | -8/+240 |
| |\ \ \ \
| | |/ /
| |/| | |
|
| | * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 11 | -35/+154 |
| | |\ \ \
| | | |/
| | |/| |
|
| | | * | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 11 | -35/+154 |
| | | |\ \ |
|
| | | | * | | One more test suppression for rpl_extra_col_master tests | Bjorn Munch | 2011-03-31 | 1 | -0/+1 |
| | | | * | | merge from 5.1 main | Bjorn Munch | 2011-03-31 | 1 | -0/+20 |
| | | | |\ \ |
|
| | * | | | | | Backport MySQL WL#2540 into MariaDB. | unknown | 2011-05-03 | 4 | -3/+13 |
| | * | | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl. | unknown | 2011-04-01 | 44 | -552/+393 |
| | |\ \ \ \ \
| | |/ / / / |
|
| | | * | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 43 | -551/+384 |
| | | |\ \ \ \ |
|
| | | * | | | | | Fixed some mysql-test-run failures and compile warnings/errors | Michael Widenius | 2011-01-20 | 2 | -3/+9 |
| | | * | | | | | Speed up `mtr --parallel=<lots>` by scheduling some slow tests earlier. | unknown | 2011-01-03 | 1 | -0/+1 |
| | * | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona. | unknown | 2011-01-10 | 4 | -4/+165 |
| | |/ / / / / |
|
| | * | | | | | Fix problems seen in Buildbot: | unknown | 2010-12-02 | 1 | -0/+1 |
| | * | | | | | Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ig... | unknown | 2010-11-30 | 1 | -0/+56 |
| | * | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 3 | -2/+63 |
| | |\ \ \ \ \ |
|
| * | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 2 | -14/+7 |
| * | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 67 | -915/+1541 |
| |\ \ \ \ \ \ \
| | |_|_|_|_|/
| |/| | | | | |
|
| | * | | | | | | Bug#12384993 EXTRA/RPL_TEST/CHECK_TYPE.INC NEED SUPPORT FOR SPECIFIC ENGINE | Magnus Blåudd | 2011-05-11 | 1 | -2/+12 |
| | * | | | | | | BUG#47741 rpl_ndb_extraCol fails in next-mr (mysql-5.1-rep+2) in RBR | Magnus Blåudd | 2011-04-27 | 1 | -6/+7 |
| | * | | | | | | merge from 5.5 main | Bjorn Munch | 2011-03-31 | 1 | -0/+20 |
| | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ | BUG#11766865: Automerged mysql-5.1 into mysql-5.5. | Luis Soares | 2011-03-25 | 1 | -0/+20 |
| | | |\ \ \ \ \ \
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | | * | | | | | Automerging bzr bundle attached to bug report into latest mysql-5.1. | Luis Soares | 2011-03-24 | 1 | -0/+20 |
| | | | |\ \ \ \ \ |
|
| | | | | * | | | | | BUG#11766865: 60091: RBR + NO PK + UPDATE NULL VALUE --> SLAVE BREAK WITH ERR... | Luis Soares | 2011-03-24 | 1 | -0/+20 |
| | * | | | | | | | | Small followup fix after MTR warning cleanup | Bjorn Munch | 2011-03-31 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | | * | | | | | | | Small followup fix after MTR warning cleanup | Bjorn Munch | 2011-03-31 | 1 | -0/+3 |
| | * | | | | | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | / / / / / /
| | |/ / / / / /
| |/| | | | | | |
|
| | | * | | | | | | mtr: cleaned up some superfluos global warning suppressions | Bjorn Munch | 2011-03-30 | 1 | -3/+3 |
| | | |/ / / / / |
|
| | * | | | | | | BUG#11877568 - RPL_SEMI_SYNC FAILS IN PB | Alfranio Correia | 2011-03-16 | 1 | -2/+2 |
| | * | | | | | | Bug #11765416 (former 58381) | Jon Olav Hauglid | 2011-03-15 | 1 | -0/+27 |
| | * | | | | | | merge from 5.5 main | Bjorn Munch | 2011-02-24 | 1 | -6/+8 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | BUG#11754075: BUG#45621: A FEW TEST FILES ARE DISABLED DUE TO WL#4284 | Luis Soares | 2011-02-15 | 1 | -6/+8 |
| | * | | | | | | | Upmerge 11762407 (54999) with additions | Bjorn Munch | 2011-02-23 | 10 | -0/+26 |
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| / / / / /
| | |/ / / / / |
|
| | | * | | | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE... | Bjorn Munch | 2011-02-23 | 8 | -1/+20 |
| | | |/ / / / |
|
| | * | | | | | merge mysql-5.1 --> mysql-5.5 | Alfranio Correia | 2011-01-31 | 2 | -36/+100 |
| | |\ \ \ \ \
| | |/ / / / |
|
| | | * | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S... | Alfranio Correia | 2011-01-28 | 2 | -34/+110 |
| | | | |_|/
| | |/| | |
|
| | * | | | | BUG#59444 | Luis Soares | 2011-01-13 | 1 | -1/+20 |
| | * | | | | BUG#59444 | Luis Soares | 2011-01-13 | 3 | -84/+46 |
| | * | | | | BUG#59444: rpl_row_show_relaylog_events fails on daily-5.5 test runs | Luis Soares | 2011-01-12 | 1 | -18/+24 |
| | * | | | | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc | unknown | 2010-12-21 | 1 | -0/+26 |
| | |\ \ \ \
| | |/ / / |
|
| | | * | | | Bug #56662 Assertion failed: next_insert_id == 0, file .\handler.cc | unknown | 2010-12-21 | 1 | -0/+26 |
| | * | | | | Some if simplifications in tests | Bjorn Munch | 2010-12-20 | 1 | -1/+1 |
| | |\ \ \ \ |
|
| | | * \ \ \ | new merge from 5.5 | Bjorn Munch | 2010-12-20 | 5 | -71/+347 |
| | | |\ \ \ \ |
|
| | | * | | | | | some more if stmt simplifications | Bjorn Munch | 2010-12-17 | 1 | -1/+1 |
| | | * | | | | | merge from 5.5 main | Bjorn Munch | 2010-12-17 | 4 | -2/+134 |
| | | |\ \ \ \ \ |
|
