1. 08 Dec, 2015 2 commits
    • Olivier Bertrand's avatar
      Merge branch 'ob-10.1' into 10.1 · 32393e22
      Olivier Bertrand authored
      32393e22
    • Olivier Bertrand's avatar
      - Serialize: Protect again eventual longjmp's. · a18a3fbd
      Olivier Bertrand authored
      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
      a18a3fbd
  2. 05 Dec, 2015 1 commit
  3. 04 Dec, 2015 1 commit
    • Olivier Bertrand's avatar
      Remove warning on Linux · 0ec89291
      Olivier Bertrand authored
        modified:   storage/connect/filamzip.cpp
      
      Avoid calling the wrong AddValue (Windows compiler error ???)
        modified:   storage/connect/json.h
      
      Fix looping bug in JARRAY::AddValue for arrays having one value.
      Fix potential crash in JVALUE::SetValue
        modified:   storage/connect/json.cpp
      
      Many changes to fix bugs, enhance memory handling and modify Jpath.
      In JSNX some functions have been re-written or added to handle new Jpath.
      BMX was re-defined to avoid a different size between Windows an Linux.
      Jbin memory was fixed to use the proper memory when adding values.
      Default pretty value is now 0 instead of 2.
      Filename is stored in BSON when IsJson == 2.
      BSON size is added to memlen in CalcLen when applicable.
      The order or parameter was switch in Json_Object_Grp.
      File name argument must be a constant (temporary?)
      Json_Set_Item now returns file name when applicable.
        modified:   storage/connect/jsonudf.cpp
        modified:   storage/connect/jsonudf.h
      
      Include "mycat.h"
        modified:   storage/connect/mycat.cc
      
      Udf_json test revisited and fixed for Linux
        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
      0ec89291
  4. 22 Nov, 2015 2 commits
    • Olivier Bertrand's avatar
      Remove commented lines. · 8a860fda
      Olivier Bertrand authored
        modified:   storage/connect/value.cpp
      Avoid warning on redefined XSTR
        modified:   storage/connect/tabxml.cpp
      8a860fda
    • Olivier Bertrand's avatar
      Make changes required by version 10.1.9 (see Sergei's mmail): · 1d239d8c
      Olivier Bertrand authored
      Use PlgDBSuballoc in JbinAlloc to avoid unsupported longjmp's.
        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/tabjson.cpp
        modified:   storage/connect/value.cpp
      Add new UDF functions jsoncontains, jsoncontains_path, json_set_item,
      json_insert_item, json_update_item, jbin_set_item, jbin_insert_item,
      jbin_update_item
        modified:   storage/connect/json.cpp
        modified:   storage/connect/json.h
        modified:   storage/connect/jsonudf.cpp
        modified:   storage/connect/jsonudf.h
      1d239d8c
  5. 08 Nov, 2015 2 commits
  6. 25 Oct, 2015 3 commits
    • Olivier Bertrand's avatar
      Fix error and warnings raised by gcc on Linux: · e7fa7e08
      Olivier Bertrand authored
       Define O_RDONLY in jsonudf.cpp
       Correct wrong deinit function names
       Make Locate functions use the variable more
       Avoid signed/unsigned warning in ha_connect.cc GetIntegerTableOption
       Initialize oom in tabodbc MakeInsert
        modified:   storage/connect/ha_connect.cc
        modified:   storage/connect/jsonudf.cpp
        modified:   storage/connect/tabodbc.cpp
      e7fa7e08
    • Olivier Bertrand's avatar
      Fix error and warnings raised by gcc on Linux: · abe87bb0
      Olivier Bertrand authored
       Define O_RDONLY in jsonudf.cpp
       Correct wrong deinit function names
       Make Locate functions use the variable more
       Avoid signed/unsigned warning in ha_connect.cc GetIntegerTableOption
       Initialize oom in tabodbc MakeInsert
        modified:   storage/connect/ha_connect.cc
        modified:   storage/connect/jsonudf.cpp
        modified:   storage/connect/tabodbc.cpp
      abe87bb0
    • Buggynours's avatar
      Fix of error and warnings when compiling on linux · de197212
      Buggynours authored
      	modifié :         storage/connect/ha_connect.cc
      	modifié :         storage/connect/jsonudf.cpp
      	nouveau fichier : storage/connect/mysql-test/connect/r/odbc_firebird.result
      	modifié :         storage/connect/mysql-test/connect/t/json.test
      	nouveau fichier : storage/connect/mysql-test/connect/t/odbc_firebird.test
      	modifié :         storage/connect/tabodbc.cpp
      	supprimé :        storage/connect/Makefile
      de197212
  7. 21 Oct, 2015 1 commit
  8. 20 Oct, 2015 1 commit
  9. 18 Oct, 2015 1 commit
    • Olivier Bertrand's avatar
      Fix MDEV-8926 · 7cd9af69
      Olivier Bertrand authored
        modified:   storage/connect/ha_connect.cc
        modified:   storage/connect/mysql-test/connect/r/datest.result
        modified:   storage/connect/mysql-test/connect/t/datest.test
      7cd9af69
  10. 17 Oct, 2015 1 commit
    • Olivier Bertrand's avatar
      Update JSON UDFs to version 1.04.0004 · 100be0b6
      Olivier Bertrand authored
        modified:   storage/connect/json.cpp
        modified:   storage/connect/json.h
        modified:   storage/connect/jsonudf.cpp
        modified:   storage/connect/mysql-test/connect/r/json_udf.result
        modified:   storage/connect/mysql-test/connect/std_data/biblio.json
        modified:   storage/connect/mysql-test/connect/t/json_udf.inc
        modified:   storage/connect/mysql-test/connect/t/json_udf.test
        modified:   storage/connect/tabjson.cpp
      100be0b6
  11. 04 Oct, 2015 1 commit
  12. 21 Sep, 2015 1 commit
    • Olivier Bertrand's avatar
      Fold all json UDF names to lower case · a575d90f
      Olivier Bertrand authored
        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/value.cpp
      a575d90f
  13. 18 Sep, 2015 2 commits
  14. 17 Sep, 2015 4 commits
  15. 16 Sep, 2015 2 commits
  16. 15 Sep, 2015 6 commits
  17. 14 Sep, 2015 7 commits
  18. 13 Sep, 2015 1 commit
  19. 12 Sep, 2015 1 commit