summaryrefslogtreecommitdiff
path: root/unittest
Commit message (Expand)AuthorAgeFilesLines
* After-merge fixesMarko Mäkelä2018-05-301-12/+12
* Merge 10.2 into 10.3Marko Mäkelä2018-05-291-1/+71
|\
| * Fix conversion warnings/errors.Vladislav Vaintroub2018-05-241-1/+1
| * Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-1/+71
| |\
| | * MDEV-10259 mysqld crash with certain statement length and...sachin2018-05-221-1/+71
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-0/+3
|\ \ \ | |/ /
| * | Merge branch 'github/10.1' into 10.2Sergei Golubchik2018-02-061-0/+3
| |\ \ | | |/
| | * Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-0/+3
| | |\
| | | * Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-241-0/+3
| | | |\
| | | | * Free memory in unit tests. Makes ASAN happier.Sergei Golubchik2018-01-221-0/+3
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-062-4/+4
* | | | | MDEV-13728 - Import MySQL 5.7 atomic operations for MSVC and SolarisSergey Vojtovich2017-11-271-1/+1
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-10-302-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Fix warnings in Win64Vladislav Vaintroub2017-10-112-2/+2
* | | | | Enusure that my_global.h is included firstMichael Widenius2017-08-242-1/+2
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-07-051-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Simplify IO_CACHE by removing current_pos and end_pos as self-referencesVicențiu Ciorbaru2017-06-281-1/+1
* | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-06-191-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-0/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-05-231-0/+3
| | |\ \ \ | | | |/ /
| | | * | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-191-0/+3
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-034-4/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-304-4/+3
| |\ \ \ \ | | |/ / /
| | * | | Correct FSF addressiangilfillan2017-03-103-3/+3
| | * | | base64 serviceSergei Golubchik2017-03-101-1/+0
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2016-12-171-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-11469 JSON_SEARCH returns incorrect results.Alexey Botchkov2016-12-091-4/+4
* | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-133-13/+3
|/ / / /
* | | | MDEV-9143 JSON_xxx functions.Alexey Botchkov2016-10-192-0/+209
* | | | MDEV-7769 MY_CHARSET_INFO refactoring# On branch 10.2Alexander Barkov2016-10-101-6/+6
* | | | Merge branch '10.2' into bb-10.2-connector-c-integ-submSergei Golubchik2016-09-211-23/+23
|\ \ \ \
| * | | | fix some quoting in error messagesSergei Golubchik2016-09-161-23/+23
* | | | | name clash with gnutls on on base64_encodeSergei Golubchik2016-09-121-6/+6
* | | | | MDEV-9293 - Use MariaDB's Connector/C in serverVladislav Vaintroub2016-08-251-2/+1
* | | | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-191-1/+2
* | | | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-191-2/+1
|/ / / /
* | | | Fixed compiler warnings and test failures found by buildbotMonty2016-06-241-1/+1
* | | | Added new range of MariaDB error messages, starting from 3000Monty2016-04-051-7/+8
* | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_differenceAlexander Barkov2016-03-311-2/+2
|/ / /
* | | Merge branch '10.0' into 10.1Oleksandr Byelkin2016-03-241-1/+43
|\ \ \ | |/ /
| * | MDEV-9773: Memory corruption in mariadb_dyncol_unpackOleksandr Byelkin2016-03-241-1/+43
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-233-3/+78
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2016-02-153-3/+77
| |\ \ | | |/
| | * compilation errors on sparc sun studio 10Sergei Golubchik2016-02-152-3/+3
| | * MDEV-4664 mysql_upgrade crashes if root's password contains an apostrophe/sin...Sergei Golubchik2016-02-061-5/+5
| | * unit test for dynstr_append_os_quoted()Sergei Golubchik2016-02-062-1/+75
| | * my_decimal didn't compile properly with debugMonty2016-01-291-1/+1
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-212-3/+76
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-12-133-2/+104
| |\ \ | | |/
| | * MDEV-8407 Numeric errors, server crash with COLUMN_JSON() on DECIMAL with pre...Oleksandr Byelkin2015-12-101-2/+32