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 |
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-07-12 | 1 | -0/+6 |
| |\ | |||||
| | * | MDEV-10318 : Fix crash in embedded, in case prepared statement has parameter ... | Vladislav Vaintroub | 2016-07-11 | 1 | -0/+6 |
* | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -2/+1 |
* | | | remove old API for SHA2 | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
* | | | bugfix: mutex order violation in embedded | Sergei Golubchik | 2017-01-15 | 1 | -1/+1 |
* | | | MDEV-10318 : Fix crash in embedded, in case prepared statement has parameter ... | Vladislav Vaintroub | 2016-07-11 | 1 | -0/+6 |
* | | | 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 |
* | | | Fixed wrong counting of global Memory_used | Monty | 2016-04-28 | 1 | -0/+3 |
* | | | 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 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright header. Added line "use is subject to license terms" | Murthy Narkedimilli | 2014-02-17 | 1 | -0/+1 |
| | * | Bug#18123048 ENABLE BUILD OF SHARED LIBMYSQLD ON LINUX | Tor Didriksen | 2014-02-04 | 1 | -1/+35 |
* | | | MDEV-5620 CMake option to compile against an external PCRE library | Sergei Golubchik | 2014-03-04 | 2 | -4/+2 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16316074 RFE: MAKE TMPDIR A BUILD-TIME CONFIGURABLE OPTION | Tor Didriksen | 2013-12-18 | 1 | -1/+1 |
| | | * | WL#7076: Backporting wl6715 to support both formats | Ashish Agarwal | 2013-08-23 | 1 | -6/+7 |
| | | |\ |