summaryrefslogtreecommitdiff
path: root/storage/connect/jsonudf.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * All changes made on 10.1Olivier Bertrand2017-02-161-49/+60
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-02-101-0/+47
|\ \ | |/
| * - Fix MDEV-11234. Escape quoting character. Should be doubled.Olivier Bertrand2016-11-061-0/+47
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-4/+8
|\ \ | |/
| * All changes made on 10.1 for last 11 commitsOlivier Bertrand2016-07-141-4/+8
* | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-92/+353
|\ \ | |/
| * - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-131-2/+2
| * git90.msg + git91.msgOlivier Bertrand2016-06-021-46/+251
| * Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-05-221-6/+7
| |\
| | * Fixed failing test cases and compiler warningsMonty2016-04-251-5/+6
| * | Add all changes made on 10.1Olivier Bertrand2016-05-121-50/+105
* | | Fixed compiler warnings and test failures found by buildbotMonty2016-06-241-2/+1
* | | Fixed compiler warnings and test failures found by buildbotMonty2016-06-221-5/+5
| |/ |/|
* | Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-161-4/+53
|\ \ | |/
| * - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-251-4/+53
* | Backported fix for ccacheMonty2016-01-031-1/+1
|/
* - Serialize: Protect again eventual longjmp's.Olivier Bertrand2015-12-081-12/+9
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-3/+4
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-6/+12
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-510/+506