Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -3/+7 |
|\ | |||||
| * | 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-10138 Support for decimals up to 38 digits | Monty | 2016-06-22 | 1 | -0/+4 |
* | | | | MDEV-5535: Cannot reopen temporary table | Nirbhay Choubey | 2016-06-10 | 1 | -0/+1 |
* | | | | cleanup: thread_count | Sergei Golubchik | 2016-06-04 | 1 | -2/+0 |
* | | | | Reuse THD for new user connections | Monty | 2016-06-04 | 1 | -2/+1 |
* | | | | MDEV-9947: COM_MULTI united response | Oleksandr Byelkin | 2016-05-17 | 1 | -1/+2 |
* | | | | Merge commit 'd5822a3ad0657040114cdc185c6387b9eb3a12b2' into 10.2 | Monty | 2016-04-28 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed wrong counting of global Memory_used | Monty | 2016-04-28 | 1 | -0/+3 |
* | | | | Merge branch '10.2' into bb-10.2-mdev9543 | Sergei Petrunia | 2016-03-28 | 2 | -3/+5 |
|\ \ \ \ | |||||
| * \ \ \ | Manual merge of branch 'bb-10.2-mdev8789' into 10.2 | Igor Babaev | 2016-03-21 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | Added sql_cte.cc for embedded. | Igor Babaev | 2015-12-22 | 1 | -0/+1 |
| * | | | | | Fixed compiler failures and warnings | Monty | 2016-03-20 | 1 | -1/+2 |
| * | | | | | MDEV-9058: protocol: COM_MULTI command (part 2) | Oleksandr Byelkin | 2016-03-18 | 1 | -1/+1 |
| * | | | | | Fixed main.null failure in embedded | Sergey Vojtovich | 2016-02-26 | 1 | -1/+1 |
| * | | | | | MDEV-6150 Speed up connection speed by moving creation of THD to new thread | Monty | 2016-02-07 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Initial patch for the implementation of window functions (MDEV-6115): | Igor Babaev | 2016-02-12 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | MDEV-8718 - Obsolete sql_strmake() in favor of THD::strmake() and thd_strmake() | Sergey Vojtovich | 2015-11-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | fix func_hybrid_type crash in --ps --embedded | Sergei Golubchik | 2015-10-15 | 1 | -0/+1 |
* | | | 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 |
* | | | MDEV-7999 - PROFILING routines take 0.2% when profiling disabledsvoj-gittest | Sergey Vojtovich | 2015-05-14 | 1 | -8/+0 |
* | | | 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 branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -0/+3 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.41 merge | Sergei Golubchik | 2014-12-19 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG | Jon Olav Hauglid | 2014-10-13 | 2 | -0/+14 |
| | | * | Update copyright text. | Alexander Nozdrin | 2014-08-28 | 1 | -0/+3 |
* | | | | Merge branch '10.1' into bb-10.1-merge | Sergei Golubchik | 2014-12-03 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge ../10.1 into bb-10.1-explain-json | Sergei Petrunia | 2014-10-15 | 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 |
* | | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||||
| * | | | | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Moving implementation of INET_ATON() INET_NTOA() into | Alexander Barkov | 2014-05-30 | 1 | -0/+1 |
|/ / / | |||||
* | | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 3 | -4/+20 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5138 Numerous test failures in "mtr --ps --embedded". | Alexey Botchkov | 2014-04-15 | 1 | -0/+12 |
| * | | MDEV-5138 Numerous test failures in "mtr --ps --embedded". | Alexey Botchkov | 2014-04-15 | 1 | -3/+6 |
| * | | MDEV-5138 Numerous test failures in "mtr --ps --embedded". | Alexey Botchkov | 2014-04-15 | 1 | -1/+1 |
| * | | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -0/+1 |
| |\ \ | | |/ |