summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-11418 - AliSQL: [Feature] Issue#1 KILL IDLE TRANSACTIONSSergey Vojtovich2017-03-221-1/+0
* MDEV-10141: Add support for INTERSECT (and common parts for EXCEPT)Oleksandr Byelkin2017-03-131-0/+6
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-03-0916-262/+266
|\
| * Fix many -Wconversion warnings.Marko Mäkelä2017-03-0716-262/+266
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-02-274-1/+14
|\ \ | |/
| * Merge branch 'bb-10.2-serg-merge' into 10.2Sergei Golubchik2017-02-111-0/+4
| |\
| | * Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-0/+4
| | |\
| | | * Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-0/+4
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-0/+4
| | | | |\
| | | | | * move check_user/set_user from mysqld.cc to mysysSergei Golubchik2016-12-221-0/+4
| * | | | | MDEV-10340: support COM_RESET_CONNECTIONOleksandr Byelkin2017-02-102-0/+4
| |/ / / /
| * | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-02-061-1/+6
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-02-064-7/+46
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-11557 port MySQL-5.7 JSON tests to MariaDB.Alexey Botchkov2017-01-241-2/+23
| * | | | Make atomic writes generalSergei Golubchik2017-01-111-0/+8
| * | | | Improve mysys/hash by caching hash_nrMonty2017-01-111-1/+1
| * | | | MDEV-11713 Optimize DBUG_PRINT and introduce DBUG_LOGMarko Mäkelä2017-01-051-4/+14
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2016-12-307-25/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-297-25/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-0/+3
| | |\ \ \ | | | |/ /
| | | * | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo...Alexander Barkov2016-11-291-0/+3
| | * | | MDEV-10759 Fix Aria to support 2-byte collation IDsMonty2016-12-022-2/+2
| | * | | Merge branch '10.0-galera' into 10.1Sergei Golubchik2016-11-022-18/+0
| | |\ \ \
| | | * \ \ Merge tag 'mariadb-10.0.28' into 10.0-galeraNirbhay Choubey2016-10-284-22/+3
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-10951 Field_newdate::cmp access violationVladislav Vaintroub2016-10-252-18/+0
| | | * | | Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-243-3/+3
| | | |\ \ \
| | | * \ \ \ Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-243-2/+9
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-292-2/+2
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-09-282-4/+3
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Merge branch '5.5' into 10.0Sergei Golubchik2016-09-272-4/+3
| | | |\ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | / | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | MDEV-10725 Server 10.1.17 fails to build using clang with c++11Sergei Golubchik2016-09-261-2/+1
| | | | * | | | don't use my_copystat in the serverSergei Golubchik2016-09-121-2/+2
* | | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2016-12-176-21/+48
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | MDEV-11562 Assertion `js->state == JST_VALUE' failed in check_contains(json_e...Alexey Botchkov2016-12-161-5/+19
| * | | | | | | MDEV-11470 JSON_KEYS accepts arguments in invalid format.Alexey Botchkov2016-12-131-0/+1
| * | | | | | | MDEV-11066 use MySQL terminology for "virtual columns"Sergei Golubchik2016-12-121-0/+6
| * | | | | | | MDEV-5800 MyISAM support for indexed vcolsSergei Golubchik2016-12-122-0/+4
| * | | | | | | cleanup: minor issues in MyISAMSergei Golubchik2016-12-121-8/+0
| * | | | | | | cleanup: my_strerrorSergei Golubchik2016-12-121-1/+1
| * | | | | | | cleanup: fix a commentSergei Golubchik2016-12-121-1/+1
| * | | | | | | MDEV-11453 JSON_CONTAINS returns incorrect values.Alexey Botchkov2016-12-111-0/+1
| * | | | | | | MDEV-11469 JSON_SEARCH returns incorrect results.Alexey Botchkov2016-12-091-6/+15
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-131-1/+1
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-132-14/+32
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-132-59/+57
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-131-81/+6
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-133-20/+1
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-132-30/+0
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-131-4/+0
* | | | | | | | MDEV-11212 - Clean-up MariaDB atomic operationsSergey Vojtovich2016-12-132-157/+1
|/ / / / / / /