summaryrefslogtreecommitdiff
path: root/client
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2019-01-241-1/+1
|\
| * Merge 10.2 into 10.3Marko Mäkelä2019-01-241-1/+1
| |\
| | * Merge 10.1 into 10.2Marko Mäkelä2019-01-241-1/+1
| | |\
| | | * Merge 10.0 into 10.1Marko Mäkelä2019-01-241-1/+1
| | | |\
| | | | * MDEV-17868 mysqltest fails to link with system PCRE librariesSergei Golubchik2019-01-241-1/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2018-12-131-16/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2018-12-131-16/+26
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2018-12-131-16/+26
| | |\ \ \ | | | |/ /
| | | * | Merge 10.0 into 10.1Marko Mäkelä2018-12-131-16/+26
| | | |\ \ | | | | |/
| | | | * Merge branch '5.5' into 10.0Sergei Golubchik2018-12-121-16/+26
| | | | |\
| | | | | * mysqltest: use a dynamically growing command bufferSergei Golubchik2018-11-281-16/+26
* | | | | | MDEV-17658 change the structure of mysql.user tableSergei Golubchik2018-12-121-0/+4
* | | | | | Changed some MySQL names in messages to MariaDBMonty2018-12-099-30/+31
* | | | | | Simple cleanups (no logic changes)Monty2018-12-091-1/+1
* | | | | | MDEV-17712 Remove C_TIME_FUZZY_DATES, C_TIME_DATETIME_ONLY, C_TIME_TIME_ONLYAlexander Barkov2018-11-141-1/+1
* | | | | | Merge 10.3 into 10.4mariadb-10.4.0Marko Mäkelä2018-11-081-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-071-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-071-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2018-11-071-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 5.5 into 10.0Marko Mäkelä2018-11-071-1/+1
| | | | |\ \ | | | | | |/
| | | | | * test framework manual is movedTakashi Sasaki2018-11-011-1/+1
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-11-062-3/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2018-11-062-3/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2018-11-062-3/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-302-3/+4
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '5.5' into 10.0Sergei Golubchik2018-10-272-3/+4
| | | | |\ \ | | | | | |/
| | | | | * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2018-10-232-3/+4
| | | | | |\
| | | | | | * Fix build break with modern compilers:Tor Didriksen2018-07-181-1/+1
| | | | | | * Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIESAditya A2018-07-092-3/+2
| | | | | | * Bug#28093271 - MYSQL OVERLOADS -b SHORT OPTION:Anushree Prakash B2018-07-031-1/+1
| | | | | | * Fix build break with modern compilers:Tor Didriksen2018-06-111-2/+2
| | | | | | * Bug#27510150: MYSQLDUMP FAILS FOR SPECIFIC --WHERE CLAUSESArun Kuruvila2018-04-091-40/+142
| | | | | | * Bug#26372491 - RCE THROUGH THE MISHANDLE OF BACKSLASHAnushree Prakash B2017-09-081-1/+4
* | | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-10-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-8765: mysqldump -use utf8mb4 by defaultDaniel Black2018-10-121-1/+1
* | | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-09-111-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed wrong #ifdef related to DBUG_ASSERT_AS_PRINTFMonty2018-09-051-1/+1
* | | | | | | MDEV-16536 Remove shared memory transportVladislav Vaintroub2018-08-2011-177/+13
* | | | | | | Merge 10.3 into 10.4Marko Mäkelä2018-08-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-08-031-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-021-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MDEV-16689: core-file should become a real server variablebb-10.1-MDEV-16689Oleksandr Byelkin2018-07-201-1/+1
* | | | | | | Merge remote-tracking branch 'origin/10.3' into 10.4Alexander Barkov2018-07-033-10/+128
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-303-10/+128
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Session tracking info support in mysqltest (port from mysql)Oleksandr Byelkin2018-06-251-1/+89
| | * | | | | Reset connection support in mysqltest (port from mysql)Oleksandr Byelkin2018-06-251-0/+28
| | * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-213-9/+11
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2018-06-123-9/+11
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch '5.5' into 10.0Vicențiu Ciorbaru2018-06-121-0/+1
| | | | |\ \ \ | | | | | |/ /
| | | | | * | mysqltest: Allow HANDLER READ in --ps-protocol testsSergei Golubchik2018-06-111-0/+1