summaryrefslogtreecommitdiff
path: root/storage/connect/jsonudf.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | | |/ | | |/|
| | * | - Set MONGO_ENABLEDOlivier Bertrand2017-08-311-1/+1
* | | | Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-53/+293
|\ \ \ \ | |/ / /
| * | | Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-2/+4
| |\ \ \ | | | |/ | | |/|
| | * | Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-08-011-28/+33
| * | | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2017-08-161-51/+289
| |\ \ \ | | | |/ | | |/|
| | * | - Fix bug returning pointer to a stack stringOlivier Bertrand2017-08-071-22/+44
| | * | -- Add mutex for user_connect handlingOlivier Bertrand2017-07-211-1/+3
| | * | -- Fix warnings from the new GCC 7Olivier Bertrand2017-07-191-0/+2
| | * | -- Finalize work on MongoDB accessOlivier Bertrand2017-07-181-29/+241
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-07-191-58/+77
|\ \ \ \ | |/ / /
| * | | Merge branch 'connect/10.2' into 10.2Sergei Golubchik2017-07-131-58/+77
| |\ \ \ | | |/ /
| | * | Fix gcc compiler warnings reported by SergeiOlivier Bertrand2017-05-231-258/+263
* | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-06-151-201/+186
|\ \ \ \ | |/ / /
| * | | Merge 10.1 into 10.2Marko Mäkelä2017-05-231-201/+186
| |\ \ \ | | |/ / | |/| / | | |/
| | * Fix wrong value of JSON columnOlivier Bertrand2017-05-111-236/+136
| | * Fix MDEV-12142 crash when creating CSV tableOlivier Bertrand2017-03-061-12/+97
* | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-4/+5
|/ /
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-49/+60
|\ \ | |/