Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -692/+0 |
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+2 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -1/+2 |
| |\ | |||||
| | * | Fix some __attribute__((nonnull)) misuse | Marko Mäkelä | 2017-05-18 | 1 | -1/+2 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -0/+7 |
|\ \ \ | |/ / | |||||
| * | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T... | Vladislav Vaintroub | 2017-03-23 | 1 | -0/+7 |
* | | | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 1 | -11/+11 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -11/+11 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -11/+11 |
| | |\ | |||||
| | | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -11/+11 |
* | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -0/+1 |
|/ / / | |||||
* | | | MDEV-9618 solaris sparc build fails on 10.1. | Alexey Botchkov | 2016-06-27 | 1 | -2/+4 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -1/+10 |
| |\ \ | | |/ | |||||
| | * | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -1/+10 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -0/+14 |
|\ \ \ | |/ / | |||||
| * | | Use C++ linkage. | Jan Lindström | 2016-02-04 | 1 | -1/+0 |
| * | | Fix function visibility as it is used on row0mysql.c in Windows. | Jan Lindström | 2016-02-03 | 1 | -0/+14 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -0/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -0/+10 |
| |\ \ | | |/ | |||||
| | * | 5.6.27-76.0 | Sergei Golubchik | 2015-12-13 | 1 | -0/+10 |
* | | | MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least o... | Jan Lindström | 2015-09-04 | 1 | -1/+9 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -2/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'bb-10.0-jan' into 10.0 | Sergei Golubchik | 2015-08-05 | 1 | -0/+9 |
| |\ \ | |||||
| | * \ | Merge commit '96badb16afcf' into 10.0 | Jan Lindström | 2015-08-03 | 1 | -0/+9 |
| | |\ \ | |||||
| | | * | | MDEV-8524: Improve error messaging when there is duplicate key or foreign key... | Jan Lindström | 2015-07-31 | 1 | -0/+9 |
| * | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 1 | -2/+9 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | 5.6.25-73.1 | Sergei Golubchik | 2015-08-01 | 1 | -2/+9 |
* | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | XtraDB-5.6.23-72.1 | Sergei Golubchik | 2015-05-05 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.23-72.1 | Sergei Golubchik | 2015-05-04 | 1 | -1/+1 |
| | * | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+613 |
| | / | |||||
* | | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 1 | -8/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+17 |
|/ / | |||||
* | | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -10/+0 |
* | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -33/+290 |
* | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
* | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+32 |
|\ \ | |/ | |||||
| * | merge Percona-Server-5.5.32-rel31.0.tar.gz | Sergei Golubchik | 2013-07-16 | 1 | -1/+32 |
* | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | XtraDB from Percona-Server-5.5.28-rel29.1 | Sergei Golubchik | 2012-11-22 | 1 | -1/+1 |
* | | MDEV-532: Async InnoDB commit checkpoint. | unknown | 2012-12-14 | 1 | -0/+11 |
|/ | |||||
* | XtraDB from Percona-Server-5.5.27-rel28.1 | Sergei Golubchik | 2012-09-05 | 1 | -0/+11 |
* | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -2/+1 |
|\ | |||||
| * | fix for | Sergei Golubchik | 2012-02-20 | 1 | -1/+0 |
| * | Remove engine-specific (but identical) icp callbacks. create one reusable | Sergei Golubchik | 2012-02-17 | 1 | -1/+1 |
* | | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5 | unknown | 2011-12-15 | 1 | -0/+1 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -0/+9 |
|\ \ | |/ | |||||
| * | Downported InnoDB support of Index Condition Pushdown from MySQL-5.6 code line. | Igor Babaev | 2011-05-25 | 1 | -0/+9 |