summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.1' into 10.2Sergei Golubchik2018-06-211-0/+4
|\
| * Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-121-0/+4
| |\
| | * Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-101-0/+4
| | |\
| | | * MDEV-10246 ssl-* config file options have no effect without mysql_ssl_set()Vladislav Vaintroub2018-06-051-0/+4
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-11/+19
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-11/+19
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-05-041-7/+15
| | |\ \ | | | |/
| | | * protocol: verify that number of rows is correctSergei Golubchik2018-05-041-7/+15
| | * | Merge branch '5.5' into 10.0mariadb-10.0.35Sergei Golubchik2018-05-011-4/+4
| | |\ \ | | | |/
| | | * Use after free in authenticationSergei Golubchik2018-05-011-2/+2
| | | * Bug#25471090: MYSQL USE AFTER FREESergei Golubchik2018-04-301-2/+2
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-04-291-1/+1
| | |\ \ | | | |/
| | | * Bug#25471090: MYSQL USE AFTER FREESergei Golubchik2018-04-271-1/+1
* | | | Merge 10.1 into 10.2Marko Mäkelä2018-04-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.0 into 10.1Marko Mäkelä2018-04-241-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-04-201-1/+1
| | |\ \ | | | |/
| | | * Bug#25471090: MYSQL USE AFTER FREESergei Golubchik2018-04-191-1/+1
* | | | Merge branch '10.1' into 10.2Vicențiu Ciorbaru2018-04-101-3/+4
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-04-071-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-04-031-2/+2
| | |\ \ | | | |/
| | | * don't disable SSL when connecting via libmysqldSergei Golubchik2018-04-031-2/+2
| * | | Fix LibreSSL X509 (SSL) certificate hostname checking.Michael Gmelin2018-04-031-1/+2
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-221-2/+5
|\ \ \ \ | |/ / /
| * | | MDEV-14265 - RPMLint warning: shared-lib-calls-exitSergey Vojtovich2017-12-191-2/+5
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-1/+1
| | |\ \ | | | |/
| | | * MDEV-13459 Warnings, when compiling with gcc-7.xSergei Golubchik2017-10-171-0/+1
* | | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-283-10/+10
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-6/+6
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-0/+1
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-0/+1
| |\ \ \ | | |/ /
| | * | MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthr...Sergei Golubchik2017-07-201-0/+1
* | | | 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