Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -0/+3 |
|\ | |||||
| * | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -0/+3 |
| |\ | |||||
| | * | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -0/+3 |
| | | |\ | |||||
| | | | * | Free memory in unit tests. Makes ASAN happier. | Sergei Golubchik | 2018-01-22 | 1 | -0/+3 |
* | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -2/+2 |
* | | | | | MDEV-13728 - Import MySQL 5.7 atomic operations for MSVC and Solaris | Sergey Vojtovich | 2017-11-27 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 2 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix warnings in Win64 | Vladislav Vaintroub | 2017-10-11 | 2 | -2/+2 |
* | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 1 | -0/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -0/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -0/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -0/+3 |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-03 | 2 | -2/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 2 | -2/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
| | * | | | base64 service | Sergei Golubchik | 2017-03-10 | 1 | -1/+0 |
* | | | | | MDEV-11212 - Clean-up MariaDB atomic operations | Sergey Vojtovich | 2016-12-13 | 3 | -13/+3 |
|/ / / / | |||||
* | | | | name clash with gnutls on on base64_encode | Sergei Golubchik | 2016-09-12 | 1 | -6/+6 |
* | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 1 | -2/+1 |
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 1 | -1/+2 |
* | | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 1 | -2/+1 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Oleksandr Byelkin | 2016-03-24 | 1 | -1/+43 |
|\ \ \ | |/ / | |||||
| * | | MDEV-9773: Memory corruption in mariadb_dyncol_unpack | Oleksandr Byelkin | 2016-03-24 | 1 | -1/+43 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 2 | -2/+77 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 2 | -2/+76 |
| |\ \ | | |/ | |||||
| | * | compilation errors on sparc sun studio 10 | Sergei Golubchik | 2016-02-15 | 1 | -2/+2 |
| | * | MDEV-4664 mysql_upgrade crashes if root's password contains an apostrophe/sin... | Sergei Golubchik | 2016-02-06 | 1 | -5/+5 |
| | * | unit test for dynstr_append_os_quoted() | Sergei Golubchik | 2016-02-06 | 2 | -1/+75 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -1/+44 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 2 | -0/+72 |
| |\ \ | | |/ | |||||
| | * | unit tests for my_getopt | Sergei Golubchik | 2015-12-09 | 2 | -0/+72 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 | Sergei Golubchik | 2015-09-04 | 1 | -2/+5 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (autoset) | Oleksandr Byelkin | 2015-09-04 | 2 | -0/+354 |
* | | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 1 | -62/+41 |
* | | | my_crypt unittest | Sergei Golubchik | 2015-09-04 | 2 | -1/+123 |
* | | | MDEV-7437 remove suport for "atomics" with rwlocks | Sergei Golubchik | 2015-01-13 | 2 | -42/+0 |
* | | | lf_hash_iterate() function | Sergei Golubchik | 2014-12-28 | 1 | -5/+18 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 2 | -178/+0 |
|\ \ | |/ | |||||
| * | fix broken -DWITHOUT_SERVER build: move sql-dependent unit test from mysys/ t... | Sergei Golubchik | 2014-05-05 | 2 | -176/+0 |
* | | 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 | 2014-02-26 | 1 | -0/+1 |
|\ \ | |||||
* | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -5/+5 |
* | | | MDEV-5085: Dynamic columns require inclusion of my_sys.h and my_global.h | unknown | 2013-10-07 | 1 | -1/+0 |
* | | | Merge 10.0-base -> 10.0 | Alexander Barkov | 2013-10-15 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | 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 | -1/+1 |
* | | | Merging TO_BASE64() and FROM_BASE64() from MySQL-5.6 | Alexander Barkov | 2013-09-23 | 1 | -1/+1 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 2 | -3/+3 |
|\ \ \ | |/ / |