Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | Revert "MDEV-16075: Workaround to run MTR test suite for make test" | Sergei Golubchik | 2018-06-20 | 1 | -1/+1 | |
| | | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-06-10 | 1 | -2/+1 | |
| | | |\ \ | | | | |/ | ||||||
| | | | * | MDEV-16075: Workaround to run MTR test suite for make test | Teodor Mircea Ionita | 2018-06-10 | 1 | -1/+1 | |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+87 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -1/+87 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | MDEV-17133 follow-up patch to fix mf_iocache-t unittest | Andrei Elkin | 2018-11-01 | 1 | -1/+1 | |
| | * | | | MDEV-17133 dump thread reads from a past position | Andrei Elkin | 2018-10-21 | 1 | -1/+86 | |
| | * | | | compiler warnings (clang 4.0.1 on i386) | Sergei Golubchik | 2018-09-04 | 1 | -2/+2 | |
| | * | | | MDEV-14014 Multi-Slave Replication Fail: bogus data in log event | Andrei Elkin | 2018-06-28 | 1 | -1/+36 | |
* | | | | | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-06-30 | 1 | -1/+36 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | MDEV-14014 Multi-Slave Replication Fail: bogus data in log event | Andrei Elkin | 2018-06-28 | 1 | -1/+36 | |
* | | | | | MDEV-16478: mysql_real_connect() from libmariadbd.so always crash | Oleksandr Byelkin | 2018-06-25 | 2 | -0/+98 | |
* | | | | | After-merge fixes | Marko Mäkelä | 2018-05-30 | 1 | -12/+12 | |
* | | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-05-29 | 1 | -1/+71 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Fix conversion warnings/errors. | Vladislav Vaintroub | 2018-05-24 | 1 | -1/+1 | |
| * | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -1/+71 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | MDEV-10259 mysqld crash with certain statement length and... | sachin | 2018-05-22 | 1 | -1/+71 | |
* | | | | | 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 | 2 | -4/+4 | |
* | | | | | 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 | 2 | -1/+2 | |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-07-05 | 1 | -1/+1 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Simplify IO_CACHE by removing current_pos and end_pos as self-references | Vicențiu Ciorbaru | 2017-06-28 | 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 | 4 | -4/+3 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 4 | -4/+3 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Correct FSF address | iangilfillan | 2017-03-10 | 3 | -3/+3 | |
| | * | | | base64 service | Sergei Golubchik | 2017-03-10 | 1 | -1/+0 | |
* | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2016-12-17 | 1 | -4/+4 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | MDEV-11469 JSON_SEARCH returns incorrect results. | Alexey Botchkov | 2016-12-09 | 1 | -4/+4 | |
* | | | | | MDEV-11212 - Clean-up MariaDB atomic operations | Sergey Vojtovich | 2016-12-13 | 3 | -13/+3 | |
|/ / / / | ||||||
* | | | | MDEV-9143 JSON_xxx functions. | Alexey Botchkov | 2016-10-19 | 2 | -0/+209 | |
* | | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2 | Alexander Barkov | 2016-10-10 | 1 | -6/+6 | |
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-subm | Sergei Golubchik | 2016-09-21 | 1 | -23/+23 | |
|\ \ \ \ | ||||||
| * | | | | fix some quoting in error messages | Sergei Golubchik | 2016-09-16 | 1 | -23/+23 | |
* | | | | | 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 | |
|/ / / / | ||||||
* | | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-24 | 1 | -1/+1 |