Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2015-12-29 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -6/+6 |
| | |\ \ | | | |/ | |||||
| | * | | Increase default MTR_PORT_GROUP_SIZE to 20. | Nirbhay Choubey | 2015-11-20 | 1 | -1/+1 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -5/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | fix a few spelling mistakes | Sergei Golubchik | 2015-12-11 | 1 | -6/+6 |
* | | | | MDEV-8542 - The "aria_recover" variable should be renamed "aria_recover_options" | Sergey Vojtovich | 2015-11-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -6/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -5/+0 |
| |\ \ | | |/ | |||||
| * | | Galera MTR Tests: Enable the use of --parallel for port-intensive Galera test... | Philip Stoev | 2015-09-09 | 1 | -6/+10 |
| * | | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -7/+11 |
| |\ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -25/+14 |
| |\ \ \ | |||||
| * \ \ \ | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 1 | -1/+6 |
| |\ \ \ \ | |||||
| * \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -10/+70 |
| |\ \ \ \ \ | |||||
| * | | | | | | Test changes (backported from 10.1). | Nirbhay Choubey | 2015-01-16 | 1 | -49/+5 |
| * | | | | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | bzr merge -r4123..4144 codership/5.6 | Nirbhay Choubey | 2014-09-30 | 1 | -0/+3 |
| * | | | | | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Minor improvements in mtr and wsrep test files. | Nirbhay Choubey | 2014-09-09 | 1 | -39/+26 |
| * | | | | | | | | Merge of patch for MDEV#6399. | Nirbhay Choubey | 2014-07-12 | 1 | -2/+2 |
| * | | | | | | | | Fix for some failing tests.mariadb-galera-10.0.12 | Nirbhay Choubey | 2014-06-26 | 1 | -1/+2 |
| * | | | | | | | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Modified mtr script to skip inclusion of 'galera' test suites | Nirbhay Choubey | 2014-06-05 | 1 | -9/+33 |
| * | | | | | | | | | Merging changes from maria-5.5-galera and | Nirbhay Choubey | 2014-05-22 | 1 | -0/+30 |
| * | | | | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -25/+13 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merged revision 3471, 3472 & 3473 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-28 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Merged r3468 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-27 | 1 | -0/+3 |
* | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -5/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | remove --default-myisam from mtr | Sergei Golubchik | 2015-10-09 | 1 | -5/+0 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least one ... | Jan Lindström | 2015-09-04 | 1 | -0/+14 |
* | | | | | | | | | | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 | Sergei Golubchik | 2015-09-04 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -7/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge commit '96badb16afcf' into 10.0 | Jan Lindström | 2015-08-03 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | MDEV-8474: InnoDB sets per-connection data unsafely | Jan Lindström | 2015-07-21 | 1 | -0/+1 |
| * | | | | | | | | | | | | MDEV-8532 MTR cannot run with --embedded on Windows on a source build | Elena Stepanova | 2015-07-25 | 1 | -7/+10 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Fixed errors and bugs found by valgrind: | Monty | 2015-09-01 | 1 | -0/+6 |
* | | | | | | | | | | | | Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ... | Monty | 2015-08-18 | 1 | -0/+1 |
* | | | | | | | | | | | | Cleanups, fixed warnings from valgrind, fixed failing tests (because on chang... | Monty | 2015-07-10 | 1 | -1/+2 |
* | | | | | | | | | | | | update test results and 32-bit rdiffs | Sergei Golubchik | 2015-06-27 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge remote-tracking branch 'github/10.1' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix test warnings by adding global supression to InnoDB warnings. | Jan Lindström | 2015-05-31 | 1 | -0/+2 |
* | | | | | | | | | | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -25/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -25/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | /run/shm is the general replacement for /dev/shm in newer distros | Daniel Black | 2015-04-27 | 1 | -2/+2 |
| | * | | | | | | | | | | MDEV-7643 MTR creates nested links when tests are run with --mem | Elena Stepanova | 2015-03-09 | 1 | -18/+6 |
* | | | | | | | | | | | | move encryption tests to a dedicate suite | Sergei Golubchik | 2015-05-13 | 1 | -0/+1 |