Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -9/+0 |
|\ | |||||
| * | Build improvements and cleanups. | Vladislav Vaintroub | 2017-09-08 | 1 | -9/+0 |
* | | remove old API for SHA2 | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -3/+7 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -3/+7 |
| |\ | |||||
| | * | Restore COMPONENT Embedded for Windows embedded libs. | Vladislav Vaintroub | 2016-05-24 | 1 | -3/+7 |
* | | | MDEV-6080: Allowing storage engine to shortcut group by queries | Monty | 2015-10-05 | 1 | -0/+1 |
* | | | MDEV-8865 Wrong field type or metadata for COALESCE(signed_int_column, unsign... | Alexander Barkov | 2015-09-30 | 1 | -0/+1 |
* | | | MDEV-8126 encryption for temp files | Sergei Golubchik | 2015-06-02 | 1 | -1/+1 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | perfschema 5.6.24 | Sergei Golubchik | 2015-05-05 | 1 | -1/+1 |
* | | | Merge branch '10.1' of github.com:MariaDB/server into 10.1 | Sergei Petrunia | 2015-04-12 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | renames to follow single consistent naming style | Sergei Golubchik | 2015-04-09 | 1 | -1/+1 |
* | | | | MDEV-7836: ANALYZE FORMAT=JSON should provide info about GROUP/ORDER BY | Sergei Petrunia | 2015-04-12 | 1 | -0/+1 |
|/ / / | |||||
* | | | encryption key management plugin api | Sergei Golubchik | 2015-02-10 | 1 | -1/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+0 |
* | | | Merge ../10.1 into bb-10.1-explain-json | Sergei Petrunia | 2014-10-15 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge 10.1 (with ANALYZE) and 10.1-explain-json | Sergei Petrunia | 2014-08-09 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | MDEV-6109: EXPLAIN JSON10.1-explain-json | Sergei Petrunia | 2014-05-27 | 1 | -0/+1 |
* | | | Moving implementation of INET_ATON() INET_NTOA() into | Alexander Barkov | 2014-05-30 | 1 | -0/+1 |
|/ / | |||||
* | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 1 | -2/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -0/+2 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -0/+2 |
| |\ \ | | |/ | |||||
| | * | install embedded_priv.h in ${INSTALL_INCLUDEDIR}/private | Sergei Golubchik | 2013-12-06 | 1 | -0/+2 |
* | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-15 | 1 | -0/+1 |
| |\ \ | |||||
| | * | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-05 | 1 | -1/+1 |
| | * | | SHOW EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-06-17 | 1 | -0/+1 |
* | | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | A follow-up for the previous commit: | Alexander Barkov | 2013-10-02 | 1 | -0/+1 |
| * | | | MDEV-4425 REGEXP enhancements | Alexander Barkov | 2013-09-26 | 1 | -2/+2 |
| |/ / | |||||
* | | | MDEV-4702 - Reduce usage of LOCK_open | Sergey Vojtovich | 2013-08-14 | 1 | -0/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+3 |
* | | | | Building libmysqld fixed. | unknown | 2013-07-16 | 1 | -0/+1 |
* | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | MDEV-26: Global Transaction ID. | unknown | 2013-03-11 | 1 | -0/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+14 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -1/+14 |
| |\ \ | | |/ | |||||
| | * | fix embedded build with for cmake 2.6.2 (older cmake could not handle IF(NOT ... | Vladislav Vaintroub | 2013-01-28 | 1 | -1/+3 |
| | * | fix embedded | Vladislav Vaintroub | 2013-01-25 | 1 | -1/+0 |
| | * | Fix embedded build | Vladislav Vaintroub | 2013-01-25 | 1 | -3/+4 |
| | * | MDEV-3842, MDEV-3923 : | Vladislav Vaintroub | 2013-01-25 | 1 | -1/+12 |
* | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge maria-5.5-mwl248 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+2 |
| |\ \ | |||||
| | * \ | Merge | Igor Babaev | 2012-06-01 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | * | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-04-11 | 1 | -2/+1 |
| | |\ \ | |||||
| | * \ \ | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -0/+1 |
| | | |\ \ \ |