summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | 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
* | | 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
* | | 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
* | | 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
* | | | 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.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 MDEV-9112 into 10.1Kristian Nielsen2016-02-011-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | MDEV-9112: Non-blocking client API missing on non-x86 platformsGeorg Richter2016-02-011-0/+1
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-27/+28
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-131-27/+28
| |\ \ \ | | |/ /
| | * | MDEV-9212 ssl-validate-cert incorrect hostname checkSergei Golubchik2015-12-081-27/+28
| * | | Fixed compiler warningsMonty2015-11-231-4/+0
* | | | compilation warningSergei Golubchik2015-11-191-4/+0
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-185/+4
|\ \ \ \ | |/ / /
| * | | MDEV-9041 connect-timeout has no effect on WindowsVladislav Vaintroub2015-11-051-185/+4
* | | | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-09-011-1/+1
* | | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-272-17/+21
|\ \ \ \ | |/ / /
| * | | MDEV-8205 timediff returns null when comparing decimal time to time string valueAlexander Barkov2015-06-151-10/+2
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-7/+19
| |\ \ \ | | |/ /
| | * | MDEV-7937: Enforce SSL when --ssl client option is usedVicențiu Ciorbaru2015-06-091-4/+19
* | | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-2/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-2/+10
| |\ \ \ | | |/ /
| | * | MDEV-7859 SSL hostname verification fails for long subject namesSergei Golubchik2015-04-271-2/+10
* | | | MDEV-6650 - LINT_INIT emits code in non-debug buildsSergey Vojtovich2015-03-161-2/+1
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-2/+2
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-2/+2
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'bzr/5.5' into bb-5.5-mergeSergei Golubchik2015-02-121-0/+5
| | |\ \
| | | * | MDEV-7435 Windows debug: Run-Time Check Failure #3 - The variable 'unused' is...Alexey Botchkov2015-02-061-0/+5
| | * | | Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42Sergei Golubchik2015-02-111-2/+2
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Bug#17599258:- ERROR 1160 (08S01): GOT AN ERROR WRITINGArun Kuruvila2014-11-101-2/+2