Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 10.0-monty | Sergei Golubchik | 2014-02-06 | 2 | -1/+10 |
|\ | |||||
| * | Automatic merge | Michael Widenius | 2014-02-05 | 2 | -1/+10 |
| |\ | |||||
| | * | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -1/+7 |
| | * | Fixed compiler warnings | Michael Widenius | 2014-01-29 | 1 | -0/+3 |
* | | | fix tests to cleanup after themselves | Sergei Golubchik | 2014-02-06 | 1 | -0/+1 |
|/ / | |||||
* | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 3 | -4/+11 |
|\ \ | |/ |/| | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-01 | 3 | -4/+11 |
| |\ | |||||
| | * | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 3 | -4/+11 |
| | |\ | |||||
| | | * | BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7) | Shivji Kumar Jha | 2013-09-27 | 3 | -4/+11 |
| | | * | BUG#14659685: main.mysqlbinlog_row_myisam.test main.mysqlbinlog_row_innodb.te... | Shivji Kumar Jha | 2012-10-30 | 1 | -0/+1922 |
| | | |\ | |||||
* | | | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work | Sergei Golubchik | 2013-12-09 | 1 | -1/+1 |
* | | | | | merge 10-base->10.0 | unknown | 2013-11-11 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 5.5 -> 10.0-base | Alexander Barkov | 2013-11-08 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Added usage of handler error names to mysqltest | Michael Widenius | 2013-11-05 | 1 | -2/+2 |
* | | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-03 | 8 | -21/+21 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Instead of writing "Errcode" to the log for Slave errors, use "Internal Maria... | Michael Widenius | 2013-05-03 | 8 | -21/+21 |
* | | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 6 | -16/+19 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-26: Global transaction ID | unknown | 2013-03-26 | 6 | -16/+19 |
* | | | | | merge | unknown | 2013-02-04 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | MDEV-4121: binlog.binlog_row_binlog sporadic test failure | unknown | 2013-01-31 | 1 | -0/+3 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -0/+1922 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -0/+1922 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+1922 |
| | |\ \ \ | |||||
| | | * \ \ | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+1922 |
| | | |\ \ \ | |||||
| | | | * \ \ | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -0/+1922 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -0/+1922 |
| | | | | |\ \ \ | | | | | | | |/ | | | | | | |/| | |||||
| | | | | | * | | BUG#14659685 - main.mysqlbinlog_row_myisam and | Shivji Kumar Jha | 2012-10-30 | 1 | -0/+1922 |
* | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 3 | -0/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-532: Fix some race conditions in test cases. | unknown | 2012-12-17 | 3 | -0/+5 |
* | | | | | | | | mark rpl_mixing_engines.test and everything that includes it a BIG test | Sergei Golubchik | 2012-10-29 | 1 | -0/+2 |
* | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 8 | -18/+65 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Made max_relay_log_size depending on master connection. | Michael Widenius | 2012-10-01 | 1 | -1/+2 |
| * | | | | | | | Automatic merge | Michael Widenius | 2012-09-22 | 4 | -5/+50 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fix for MDEV-533: Confusing error code when doing auto-increment insert for o... | Michael Widenius | 2012-09-18 | 4 | -5/+50 |
| * | | | | | | | MDEV-232: Remove one fsync() from commit phase. | unknown | 2012-09-13 | 1 | -1/+1 |
| * | | | | | | | MDEV-181: XID crash recovery across binlog boundaries | unknown | 2012-06-22 | 3 | -11/+12 |
| |/ / / / / / | |||||
* | | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 5 | -479/+708 |
|/ / / / / / | |||||
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -16/+25 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -0/+4 |
| | | |\ \ \ | | | | |/ / | |||||
* | | | | | | c | Sergei Golubchik | 2012-05-21 | 1 | -0/+19 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | BUG#12662190:COM_COMMIT IS NOT INCREMENTED FROM THE BINARY LOGS ON SLAVE, COM... | Sujatha Sivakumar | 2012-04-12 | 1 | -0/+35 |
* | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 5 | -1/+15 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFE | Rohit Kalhans | 2012-02-09 | 4 | -0/+13 |
| * | | | | | Backout the patch for bug#11758263. | Rohit Kalhans | 2012-02-08 | 4 | -13/+0 |
| * | | | | | BUG#11758263 50440: MARK UNORDERED UPDATE WITH AUTOINC UNSAFE | Rohit Kalhans | 2012-02-08 | 4 | -0/+13 |
| * | | | | | merge from 5.5 repo. | Andrei Elkin | 2012-01-31 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | bug#3593869-64035 | Andrei Elkin | 2012-01-19 | 1 | -1/+2 |
* | | | | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 2 | -0/+37 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | |