Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 13 | -13/+13 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 12 | -12/+12 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 12 | -12/+12 |
| * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
* | | | MDEV-17702 fix unaligned access UB in sint4korr() and similar functions | Eugene Kosov | 2019-05-03 | 2 | -1/+103 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-03 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.1 into 10.1 | Marko Mäkelä | 2019-02-02 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge branch '5.5' into 10.0 | Oleksandr Byelkin | 2019-01-28 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-18269 - fix off-by-one bug in unittest | Natanael Copa | 2019-01-16 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2mariadb-10.2.21 | Sergei Golubchik | 2018-12-30 | 4 | -46/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-12-29 | 4 | -46/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-12-20 | 4 | -46/+11 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-15670 - unit.my_atomic failed in buildbot with Signal 11 thrown | Sergey Vojtovich | 2018-12-18 | 4 | -46/+11 |
* | | | | 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 |
* | | | | Fix warnings in Win64 | Vladislav Vaintroub | 2017-10-11 | 2 | -2/+2 |
* | | | | 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 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 |
* | | | | 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 |