summaryrefslogtreecommitdiff
path: root/sql-common
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-05-051-3/+17
|\
| * Merge 10.3 into 10.4Marko Mäkelä2020-05-051-3/+17
| |\
| | * Merge branch '10.2' into 10.3Oleksandr Byelkin2020-05-041-3/+17
| | |\
| | | * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-05-021-3/+17
| | | |\
| | | | * Merge branch '5.5' into 10.1Oleksandr Byelkin2020-04-301-3/+17
| | | | |\
| | | | | * Bug#30689251 - BACKPORT TO MYSQL-5.6, BUG#29597896 - NULL POINTER DEREFERENCE...Anushree Prakash B2020-04-301-3/+17
* | | | | | MDEV-17812 Use MariaDB in error messages instead of MySQLRasmus Johansson2020-04-081-9/+10
* | | | | | cleanup: PSI key is *always* the first argumentSergei Golubchik2020-03-101-4/+5
* | | | | | perfschema memory related instrumentation changesSergei Golubchik2020-03-102-41/+135
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2020-01-281-1/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2020-01-211-1/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-211-1/+4
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-201-1/+4
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2020-01-191-1/+4
| | | | |\ \ | | | | | |/
| | | | | * Bug#29630767 - USE OF UNINITIALIZED VALUE IN LIBMYSQL (CLIENT.CC FUNCTION RUN...mariadb-5.5.67Sergei Golubchik2020-01-181-1/+4
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-12-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-12-091-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Lintian complains on spelling errorFaustin Lammler2019-12-021-1/+1
* | | | | | cleanup: don't use my_getopt_is_args_separator()Sergei Golubchik2019-10-141-2/+0
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-10-111-8/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-10-101-8/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-10-091-8/+5
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix problem with warnings of new compilers.Oleksandr Byelkin2019-10-041-2/+0
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-09-061-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4, except for MDEV-20265Marko Mäkelä2019-08-231-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-08-211-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.1 into 10.2Marko Mäkelä2019-08-201-1/+1
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-19034 ASAN unknown-crash in get_date_time_separator with PAD_CHAR_TO_FUL...Alexander Barkov2019-08-201-1/+1
* | | | | | Merge remote-tracking branch 'origin/10.4' into 10.5Alexander Barkov2019-08-132-2/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-19301 Assertion `!is_valid_datetime() || fraction_remainder(((item->deci...Alexander Barkov2019-08-061-1/+5
| * | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-07-281-1/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-07-261-1/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-261-1/+7
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+1
| | | | |\ \ | | | | | |/
| | | | | * Backslash added to wrong cachacters of names of client plugin.mariadb-5.5.65Oleksandr Byelkin2019-07-251-1/+1
| | | | * | Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-251-1/+7
| | | | |\ \ | | | | | |/
| | | | | * MDEV-20110 don't try to load client plugins with invalid namesSergei Golubchik2019-07-211-1/+7
* | | | | | Merge 10.4 into 10.5Marko Mäkelä2019-06-201-247/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.3 into 10.4Marko Mäkelä2019-06-191-246/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.2 into 10.3Marko Mäkelä2019-06-191-246/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-19750 mysql command wrong encodingVladislav Vaintroub2019-06-171-246/+6
* | | | | | Windows related cleanups, remove old code.Vladislav Vaintroub2019-06-181-30/+15
|/ / / / /
* | | | | MDEV-18531 : Use WolfSSL instead of YaSSL as "bundled" SSL/encryption libraryVladislav Vaintroub2019-05-221-3/+9
* | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-197-9/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-05-147-7/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-05-137-7/+7
| | |\ \ \ | | | |/ /
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-115-5/+5
| | | |\ \ | | | | |/
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-115-5/+5
| * | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-05-121-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-05-041-2/+4
| | |\ \ \ | | | |/ /