Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -5/+6 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 1 | -5/+6 |
| |\ | |||||
| | * | MDEV-6262 analyze the coverity report on mariadb | Sergei Golubchik | 2017-05-19 | 1 | -5/+6 |
* | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Sergei Golubchik | 2017-05-09 | 1 | -6/+2 |
* | | | MDEV-10332 support for OpenSSL 1.1 and LibreSSL | Georg Richter | 2017-05-09 | 1 | -1/+5 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -2/+2 |
| | |\ | |||||
| | | * | respect client's desire to force ssl even when WITH_SSL=NO | Sergei Golubchik | 2017-04-20 | 1 | -2/+2 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 1 | -11/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-10594 SSL hostname verification fails for SubjectAltNames | Sergei Golubchik | 2017-04-27 | 1 | -10/+11 |
| * | | | bugfix: federated/replication did not increment bytes_received status variable | Sergei Golubchik | 2017-04-27 | 1 | -1/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -10/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | don't do vio_description(NULL) | Sergei Golubchik | 2017-03-10 | 1 | -1/+1 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -9/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -9/+2 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-11933 Wrong usage of linked list in mysql_prune_stmt_list | Sergei Golubchik | 2017-02-27 | 1 | -9/+2 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -6/+6 |
* | | | | fix the ABI and stop slave hang problem | vinchen | 2016-10-21 | 1 | -2/+8 |
* | | | | buildbot failures | Sergei Golubchik | 2016-09-22 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into bb-10.2-connector-c-integ-subm | Sergei Golubchik | 2016-09-21 | 4 | -5/+33 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #232 from 0xAX/no-need-to-zero-vio-net | Sergey Vojtovich | 2016-09-12 | 1 | -1/+0 |
| |\ \ \ \ | |||||
| | * | | | | no need to set net->vio to zero in mysql_real_connect | Alexander Kuleshov | 2016-09-09 | 1 | -1/+0 |
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 3 | -4/+11 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 3 | -4/+11 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -2/+2 |
| | | * | | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0 | Oleksandr Byelkin | 2016-08-16 | 2 | -2/+7 |
| | | * | | MDEV-10455: libmariadbclient18 + MySQL-python leaks memory on failed connections | Oleksandr Byelkin | 2016-08-11 | 1 | -1/+3 |
| * | | | | MDEV-8931: (server part of) session state tracking | Oleksandr Byelkin | 2016-08-31 | 1 | -0/+22 |
* | | | | | After-review changes | Sergei Golubchik | 2016-09-12 | 2 | -231/+0 |
* | | | | | remove libmysql/ | Sergei Golubchik | 2016-09-12 | 3 | -0/+500 |
* | | | | | MDEV-9293 - Use MariaDB's Connector/C in server | Vladislav Vaintroub | 2016-08-25 | 2 | -6/+12 |
|/ / / / | |||||
* | | | | Revert "MDEV-9293 Connector/C integration" | Vladislav Vaintroub | 2016-08-19 | 2 | -12/+6 |
* | | | | MDEV-9293 Connector/C integration | Vladislav Vaintroub | 2016-08-19 | 2 | -6/+12 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -15/+31 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -15/+31 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -15/+31 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-06-14 | 1 | -4/+18 |
| | | |\ | |||||
| | | | * | Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BE | Arun Kuruvila | 2016-03-01 | 1 | -4/+19 |
* | | | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -2/+2 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 2 | -7/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 2 | -7/+7 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 2 | -7/+7 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-02-25 | 1 | -32/+57 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -32/+57 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -32/+57 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 1 | -32/+57 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITM | Yashwant Sahu | 2016-01-11 | 1 | -26/+64 |
| | * | | | Merge MDEV-9112 into 10.0 | Kristian Nielsen | 2016-02-01 | 1 | -0/+1 |
| | |\ \ \ | | | |/ / | |||||
* | | | | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |