summaryrefslogtreecommitdiff
path: root/storage/connect/jsonudf.cpp
Commit message (Collapse)AuthorAgeFilesLines
* All changes made on 10.1 for last 11 commitsOlivier Bertrand2016-07-141-4/+8
|
* - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-131-2/+2
| | | | | | | | | | | | | | | | | | modified: storage/connect/tabtbl.cpp - Add trace and make m_Stmt conditional modified: storage/connect/myconn.cpp modified: storage/connect/myconn.h - Protect trace from null string (for Linux) modified: storage/connect/tabcol.cpp - Record error changes modified: storage/connect/mysql-test/connect/r/jdbc_new.result - Typo modified: storage/connect/jdbconn.cpp modified: storage/connect/jsonudf.cpp
* 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
| | | | | | | | | | | | | | | | | | | | | | - Fixed wait condition in kill_processlist-6619 - Updated Ssl_chiper for openssl tests - Added supression for valgrinds when using libcrypto - Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug - Adding missing debug_sync_update() to debug_sync.h - Added initializers to some variables and fixed error handling in jsonudf.cpp - Fixed cluster_filter_unpack_varchar which doesn't have a stable index type. - Updated compiler_warnings.supp
| * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-02-161-4/+53
| |\
| * | Backported fix for ccacheMonty2016-01-031-1/+1
| | | | | | | | | | | | | | | Fixed compiler warnings Added --big-test to tokudb change_column_char & change_column_bin
* | | Add all changes made on 10.1Olivier Bertrand2016-05-121-50/+105
| |/ |/|
* | - Change SQL_NTS to 0 when the string is NULLOlivier Bertrand2016-01-251-4/+53
|/ | | | | | | | | | | | | modified: storage/connect/odbconn.cpp - Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed) modified: storage/connect/ha_connect.cc modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/mysql-test/connect/r/json_udf.result modified: storage/connect/mysql-test/connect/t/json_udf.inc modified: storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/mysql-test/connect/t/json_udf2.inc
* - Serialize: Protect again eventual longjmp's.Olivier Bertrand2015-12-081-12/+9
| | | | | | | | | | | | | | | | Always return NULL on error. Adding also the file length. modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp - JSONCOL::WriteColumn Add types SHORT and BIGINT as accepted modified: storage/connect/tabjson.cpp - TDBJSN: Make this type use a separate storage for Json parsing and retrieve this memory between each rows. This is necessary to be able to handle big tables. See MDEV-9228. modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-3/+4
| | | | | | Parsing memory, not added in CalcLen, is added in CheckMemory. Adding also the file length. modified: storage/connect/jsonudf.cpp
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-6/+12
| | | | | | Parsing memory, not added in CalcLen, is added in CheckMemory. Oups... last commit was buggy modified: storage/connect/jsonudf.cpp
* Fix memory error when a plain string argument is parsed.Olivier Bertrand2015-12-051-510/+506
| | | | | Parsing memory, not added in CalcLen, is added in CheckMemory. modified: storage/connect/jsonudf.cpp
* Commit updating CONNECT from the 10.1 versionOlivier Bertrand2015-12-041-346/+4608
|
* Fix (?) retrieving integer arguments in JSON UDF'sOlivier Bertrand2015-07-221-1/+1
| | | | modified: storage/connect/jsonudf.cpp
* Commit merge resolved filesOlivier Bertrand2015-06-051-12/+0
|
* Commit merge resolved filesOlivier Bertrand2015-06-051-0/+12
|\
| * - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-051-14/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: tabxml.cpp added: xml_html.test xml_html.result beers.xml coffee.htm - Fix MDEV-7935 by suppressing error resetting code in delete_or_rename_table. However, the issue is that this code was added because without it an assertion was raised in some cases. Unfortunately I can't remember what were these cases. Therefore fixing it in this case will perhaps make a new crash happening on another cases. modified: ha_connect.cc - Add the UDF Json_Array_Delete. modified: jsonudf.cpp
* | In BIN table date_format now imply by default field_format='C'.Olivier Bertrand2015-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/tabfix.cpp modified: storage/connect/reldef.cpp Json array index (position) is now 0 based by default. This corresponds to what all json applications and functions do. Also fix ROWNUM calculation. modified: storage/connect/jsonudf.cpp modified: storage/connect/mysql-test/connect/r/json.result modified: storage/connect/mysql-test/connect/t/json.test modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h
* | Get rid of GCC warnings about unused parametersOlivier Bertrand2015-05-091-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/block.h modified: storage/connect/catalog.h modified: storage/connect/colblk.cpp modified: storage/connect/colblk.h modified: storage/connect/connect.cc modified: storage/connect/filamap.cpp modified: storage/connect/filamdbf.cpp modified: storage/connect/filamfix.cpp modified: storage/connect/filamtxt.cpp modified: storage/connect/filamtxt.h modified: storage/connect/filamvct.cpp modified: storage/connect/filamzip.cpp modified: storage/connect/filter.h modified: storage/connect/ha_connect.c modified: storage/connect/jsonudf.cpp modified: storage/connect/mycat.h modified: storage/connect/myconn.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabcol.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabfmt.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/table.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/taboccur.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabtbl.h modified: storage/connect/tabutil.cpp modified: storage/connect/tabutil.h modified: storage/connect/tabvct.cpp modified: storage/connect/tabvir.cpp modified: storage/connect/tabvir.h modified: storage/connect/tabxcl.cpp modified: storage/connect/tabxcl.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h modified: storage/connect/valblk.cpp modified: storage/connect/valblk.h modified: storage/connect/value.cpp modified: storage/connect/value.h modified: storage/connect/xindex.cpp modified: storage/connect/xindex.h modified: storage/connect/xobject.h modified: storage/connect/xtable.h
* | - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-051-14/+80
|/ | | | | | | | | | | | | | | | | | | | | modified: tabxml.cpp added: xml_html.test xml_html.result beers.xml coffee.htm - Fix MDEV-7935 by suppressing error resetting code in delete_or_rename_table. However, the issue is that this code was added because without it an assertion was raised in some cases. Unfortunately I can't remember what were these cases. Therefore fixing it in this case will perhaps make a new crash happening on another cases. modified: ha_connect.cc - Add the UDF Json_Array_Delete. modified: jsonudf.cpp
* - Remove a signed/unsigned warning.Olivier Bertrand2015-03-011-1/+1
| | | | | | modified: storage/connect/jsonudf.cpp
* - Fix crash when Json_Value was called without arguments.Olivier Bertrand2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Correct memory calculation in Serialize. Correct some UDF's messages. Add and modify the json tests removed: storage/connect/mysql-test/connect/std_data/biblio.jsn storage/connect/mysql-test/connect/std_data/expense.jsn storage/connect/mysql-test/connect/std_data/mulexp3.jsn storage/connect/mysql-test/connect/std_data/mulexp4.jsn storage/connect/mysql-test/connect/std_data/mulexp5.jsn added: storage/connect/mysql-test/connect/r/json_udf.result storage/connect/mysql-test/connect/std_data/biblio.json storage/connect/mysql-test/connect/std_data/expense.json storage/connect/mysql-test/connect/std_data/mulexp3.json storage/connect/mysql-test/connect/std_data/mulexp4.json storage/connect/mysql-test/connect/std_data/mulexp5.json storage/connect/mysql-test/connect/t/json_udf.test modified: storage/connect/json.cpp storage/connect/jsonudf.cpp storage/connect/mysql-test/connect/r/json.result storage/connect/mysql-test/connect/t/json.test
* - Fix MDEV-7616 by adding SQLCOM_SET_OPTION to the accepted command list.Olivier Bertrand2015-02-241-0/+44
| | | | | | | | | | | | | modified: storage/connect/ha_connect.cc - Add new JSON UDF functions and JSON functionalities. modified: storage/connect/json.cpp storage/connect/json.h storage/connect/jsonudf.cpp storage/connect/tabjson.cpp
* - Add new Json UDF's Json_Array_Add, Json_Array_Grp and Json_Object_Grp.Olivier Bertrand2015-02-221-12/+100
| | | | | | | | | | | | | | | | | Handle longjmp's raised during json processing. modified: storage/connect/global.h storage/connect/ha_connect.cc storage/connect/json.cpp storage/connect/jsonudf.cpp - Fix wrong references to the suppressed g->Trace variables. modified: storage/connect/global.h storage/connect/plugutil.c storage/connect/tabjson.cpp storage/connect/tabodbc.cpp
* - Remove GCC warningsOlivier Bertrand2015-02-191-1/+1
| | | | | | | modified: storage/connect/jsonudf.cpp storage/connect/tabutil.h
* - Work on JSON and JSON UDF'sOlivier Bertrand2015-02-191-17/+129
| | | | | | | | | | | | modified: storage/connect/json.cpp storage/connect/jsonudf.cpp storage/connect/tabjson.cpp - CntReadNext: Enable EvalColumns for longjmp modified: storage/connect/connect.cc
* - Adding json udf's. Making the second version of json tables.Olivier Bertrand2015-02-111-0/+382
added: storage/connect/jsonudf.cpp modified: storage/connect/CMakeLists.txt storage/connect/json.cpp storage/connect/json.h storage/connect/tabjson.cpp storage/connect/tabjson.h - Fix utf8 issues with PROXY tables modified: storage/connect/ha_connect.cc storage/connect/tabutil.cpp storage/connect/tabutil.h
View Lorry Controller Status