summaryrefslogtreecommitdiff
path: root/storage/connect/jsonudf.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-10-301-45/+501
|\
| * Merge 10.3 into 10.4Marko Mäkelä2020-10-291-45/+501
| |\
| | * Merge 10.2 into 10.3Marko Mäkelä2020-10-281-45/+505
| | |\
| | | * - Inline MakePtr and MakeOff with OFFSET as size_tOlivier Bertrand2020-10-181-24/+476
| | | * - Use BIN type when charset='binary'Olivier Bertrand2020-10-051-4/+6
| | | * - Make possible to allocate work space larger than 4GBOlivier Bertrand2020-10-011-19/+25
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-02-071-8/+9
|\ \ \ \ | |/ / /
| * | | Fixed compiler warnings from gcc 7.4.1Monty2020-01-291-15/+17
| |/ /
* | | Merge 10.4 into 10.5Marko Mäkelä2019-09-061-4/+4
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-09-021-4/+4
| |\ \ | | |/
| | * In CONNECT version 1.6.10 NOSQL facility is enhanced by a new way to retrieve...Olivier Bertrand2019-07-301-4/+4
* | | Fixed compiler warnings from connect engineMonty2019-08-231-7/+8
|/ /
* | dirty mergeOleksandr Byelkin2019-02-071-1/+47
|\ \ | |/
| * Merge remote-tracking branch 'connect/11.2' into 10.2Oleksandr Byelkin2019-02-041-1/+48
| |\
| | * - Fix MDEV-13136: enhance CREATE SERVER MyServerNameOlivier Bertrand2019-02-031-1/+48
* | | Merge branch '10.2' into 10.3Sergei Golubchik2019-01-031-6/+6
|\ \ \ | |/ /
| * | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2018-12-201-6/+6
| |\ \ | | |/
| | * - Make PlugSubAlloc to be exportableOlivier Bertrand2018-12-011-6/+6
* | | Merge branch '10.2' into 10.3Sergei Golubchik2018-08-121-1/+1
|\ \ \ | |/ /
| * | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2018-08-071-1/+1
| |\ \ | | |/
| | * - Fix MDEV-16672 Connect: Warnings with 10.0Olivier Bertrand2018-08-061-1/+1
* | | Merge branch '10.2' into 10.3Sergei Golubchik2018-05-111-3/+1
|\ \ \ | |/ /
| * | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2018-05-101-1/+1
| |\ \ | | |/
| | * - Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious conditionOlivier Bertrand2018-05-071-2/+2
| * | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-101-2/+0
| |\ \
| | * \ Merge branch '10.0' into 10.1Sergei Golubchik2018-05-051-286/+576
| | |\ \
| | | * | Squashed commit of connect/10.0:Sergei Golubchik2018-04-261-286/+576
| | * | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-021-10/+3
| | |\ \ \ | | | |/ /
| | | * | Squashed commit of connect/10.0:Vicențiu Ciorbaru2018-01-241-10/+3
| | * | | Merge 10.0 into 10.1Marko Mäkelä2017-10-261-10/+15
| | |\ \ \ | | | |/ /
| | | * | Squashed commit of the following:Vicențiu Ciorbaru2017-10-261-10/+15
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-03-281-286/+576
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'connect/10.2' into 10.2Vicențiu Ciorbaru2018-03-181-286/+576
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | - Remove warning on not used tabtyp variable in connect_assisted_discoveryOlivier Bertrand2018-02-251-274/+564
| | * | | - Use delayed load for the MongoDB C Drive on WindowsOlivier Bertrand2018-01-301-11/+11
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-11-291-10/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2017-11-221-10/+3
| |\ \ \ \ | | |/ / /
| | * | | - Fix MDEV-13925: Actually this fixes SELECT queries whenOlivier Bertrand2017-10-311-10/+3
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-301-12/+17
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2017-10-261-11/+16
| |\ \ \ \ | | |/ / /
| | * | | - Fix a bug in TYPVAL<PSZ> compute causing it sometime not to be executedOlivier Bertrand2017-10-161-0/+3
| | * | | - Make another temporary fix for the compiler bug in CalculateArrayOlivier Bertrand2017-10-161-9/+13
| | * | | - Update version numberOlivier Bertrand2017-10-151-10/+8
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-10-241-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Various compier warningsSergei Golubchik2017-10-221-1/+1
| | | |/ | | |/|
| | * | Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-09-191-80/+332
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-1/+1
|\ \ \ \ | |/ / /
| * | | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-1/+1
* | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2017-09-201-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'connect/10.2' into 10.2bb-10.2-vicentiu2Vicențiu Ciorbaru2017-09-191-1/+1
| |\ \ \ | | | |/ | | |/|