summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2017-05-231-5/+6
|\
| * Merge 10.0 into 10.1Marko Mäkelä2017-05-231-5/+6
| |\
| | * MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-191-5/+6
* | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLSergei Golubchik2017-05-091-6/+2
* | | MDEV-10332 support for OpenSSL 1.1 and LibreSSLGeorg Richter2017-05-091-1/+5
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-2/+2
|\ \ \ | |/ /
| * | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-2/+2
| |\ \ | | |/
| | * Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-2/+2
| | |\
| | | * respect client's desire to force ssl even when WITH_SSL=NOSergei Golubchik2017-04-201-2/+2
* | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-061-11/+12
|\ \ \ \ | |/ / /
| * | | MDEV-10594 SSL hostname verification fails for SubjectAltNamesSergei Golubchik2017-04-271-10/+11
| * | | bugfix: federated/replication did not increment bytes_received status variableSergei Golubchik2017-04-271-1/+1
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-10/+3
|\ \ \ \ | |/ / /
| * | | don't do vio_description(NULL)Sergei Golubchik2017-03-101-1/+1
| * | | Merge 10.0 into 10.1Marko Mäkelä2017-03-091-9/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2017-03-031-9/+2
| | |\ \ | | | |/
| | | * MDEV-11933 Wrong usage of linked list in mysql_prune_stmt_listSergei Golubchik2017-02-271-9/+2
* | | | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-6/+6
* | | | fix the ABI and stop slave hang problemvinchen2016-10-211-2/+8
* | | | buildbot failuresSergei Golubchik2016-09-221-1/+1
* | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-214-5/+33
|\ \ \ \
| * \ \ \ Merge pull request #232 from 0xAX/no-need-to-zero-vio-netSergey Vojtovich2016-09-121-1/+0
| |\ \ \ \
| | * | | | no need to set net->vio to zero in mysql_real_connectAlexander Kuleshov2016-09-091-1/+0
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-093-4/+11
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-253-4/+11
| | |\ \ \ | | | |/ /
| | | * | Fixed compiler error and some warnings on windowsMonty2016-08-231-2/+2
| | | * | MDEV-10559: main.mysql_client_test_nonblock crashes in buildbot on 10.0Oleksandr Byelkin2016-08-162-2/+7
| | | * | MDEV-10455: libmariadbclient18 + MySQL-python leaks memory on failed connectionsOleksandr Byelkin2016-08-111-1/+3
| * | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-0/+22
* | | | | After-review changesSergei Golubchik2016-09-122-231/+0
* | | | | remove libmysql/Sergei Golubchik2016-09-123-0/+500
* | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-252-6/+12
|/ / / /
* | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-192-12/+6
* | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-192-6/+12
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-15/+31
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-15/+31
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into bb-10.0Sergei Golubchik2016-06-211-15/+31
| | |\ \ | | | |/
| | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-06-141-4/+18
| | | |\
| | | | * Bug#21920657: SSL-CA FAILS SILENTLY IF THE PATH CANNOT BEArun Kuruvila2016-03-011-4/+19
* | | | | General spell fixing in comments and stringsOtto Kekäläinen2016-06-081-2/+2
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-03-232-7/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-03-212-7/+7
| |\ \ \ \ | | |/ / /
| | * | | Fix spelling: occurred, execute, which etcOtto Kekäläinen2016-03-042-7/+7
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-02-251-32/+57
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-32/+57
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-151-32/+57
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-02-091-32/+57
| | | |\ \ | | | | |/
| | | | * Bug #22295186: CERTIFICATE VALIDATION BUG IN MYSQL MAY ALLOW MITMYashwant Sahu2016-01-111-26/+64
| | * | | Merge MDEV-9112 into 10.0Kristian Nielsen2016-02-011-0/+1
| | |\ \ \ | | | |/ /
* | | | | Merge branch '10.1' into 10.2Monty2016-02-061-0/+1
|\ \ \ \ \ | |/ / / /