summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | MDEV-9117: Client Server capability negotiation for MariaDB specific function...Oleksandr Byelkin2016-02-021-1/+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