summaryrefslogtreecommitdiff
path: root/storage/connect
Commit message (Collapse)AuthorAgeFilesLines
* Fixed compiler warnings from gcc 7.4.1Monty2020-01-2934-156/+212
| | | | - Fixed possible error in rocksdb/rdb_datadic.cc
* Merge branch '10.3' into 10.4Oleksandr Byelkin2020-01-219-24/+139
|\
| * Merge branch '10.2' into 10.3Oleksandr Byelkin2020-01-219-24/+139
| |\
| | * Merge branch '10.1' into 10.2Oleksandr Byelkin2020-01-204-3/+100
| | |\
| | | * - Update grant tests for new MariaDB version 10.1.44Olivier Bertrand2020-01-1212-324/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/mysql-test/connect/disabled.def modified: storage/connect/mysql-test/connect/r/grant.result modified: storage/connect/mysql-test/connect/r/ini_grant.result modified: storage/connect/mysql-test/connect/r/mysql_grant.result modified: storage/connect/mysql-test/connect/r/xml2_grant.result modified: storage/connect/mysql-test/connect/r/xml_grant.result modified: storage/connect/mysql-test/connect/t/grant.inc modified: storage/connect/mysql-test/connect/t/grant.test modified: storage/connect/mysql-test/connect/t/grant2.test modified: storage/connect/mysql-test/connect/t/ini_grant.test modified: storage/connect/mysql-test/connect/t/mysql_grant.test
| | | * Merge with last MariaDB versionOlivier Bertrand2020-01-114-2/+2
| | | |\
| | | * | - Fix MDEV-21450Olivier Bertrand2020-01-111-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failed compile when XML table type is not supported. Was because XMLDEF was unconditionally called from REST table. modified: storage/connect/tabrest.cpp
| | | * | Update to version 1.07 (as for MariaDB 10.2)Olivier Bertrand2020-01-0933-721/+913
| | | | |
| | * | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2020-01-205-21/+39
| | |\ \ \
| | | * | | - Fix MDEV-21450Olivier Bertrand2020-01-123-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failed compile when XML table type is not supported. Was because XMLDEF was unconditionally called from REST table. modified: storage/connect/tabrest.cpp - Make cmake less verbose modified: storage/connect/CMakeLists.txt - Hide Switch_to_definer_security_ctx not defined for 10.1 and 10.0 modified: storage/connect/ha_connect.cc
| | | * | | Make LIKE_FUNC only for version >= 10.2 in ha_connect.ccOlivier Bertrand2019-12-101-0/+2
| | | | | |
| | | * | | Fix reldef.cpp (wrong flag for catalog columns)Olivier Bertrand2019-12-041-6/+4
| | | | | |
| | | * | | Fix tabrest.cpp when used for OEMOlivier Bertrand2019-12-031-8/+9
| | | | | |
| | | * | | Make restGetFile extern COlivier Bertrand2019-12-033-4/+8
| | | | | |
| | | * | | comment out <dlfnc.h> in tabrest.cppcOlivier Bertrand2019-12-011-3/+3
| | | | | |
| | | * | | <dlfnc.h> in tabrest.cpp and redef.cppOlivier Bertrand2019-12-012-4/+4
| | | | | |
| | | * | | Add include <dlfnc.h> in tabrest.cppOlivier Bertrand2019-11-301-1/+4
| | | | | |
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2019-12-271-9/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2019-12-271-9/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2Marko Mäkelä2019-12-231-9/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix overly chatty connect cmake, once againVladislav Vaintroub2019-12-111-5/+1
| | | | | |
* | | | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-12-0930-353/+534
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-12-0428-349/+530
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2019-12-0327-348/+529
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | - Fix MDEV-13782Olivier Bertrand2019-11-266-34/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem with NOT LIKE queries. modified: storage/connect/ha_connect.cc modified: sql/item_cmpfunc.h - Fix MDEV-21084 Misusage of strncat could cause buffer overflow. modified: storage/connect/reldef.cpp modified: storage/connect/tabcmg.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabrest.cpp modified: storage/connect/tabxml.cpp
| | | * | | These changed were made after pulling 10.2.30 from originOlivier Bertrand2019-11-244-41/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --------------------------------------------------------- - Temporarily fix MDEV-13782 by commenting out LIKE_FUNC in CondFilter modified: storage/connect/ha_connect.cc - Remove use of hack tables modified: storage/connect/connect.cc modified: storage/connect/connect.h modified: storage/connect/ha_connect.cc modified: storage/connect/xtable.h
| | | * | | Fix compile error (missing declaration) in tabrest.cppOlivier Bertrand2019-11-212-14/+19
| | | | | |
| | | * | | Fix compile error (missing declaration) in tabrest.cppOlivier Bertrand2019-11-211-5/+5
| | | | | |
| | | * | | Fix compile error (imcomplete switch) in ha_connect.ccOlivier Bertrand2019-11-211-0/+4
| | | | | |
| | | * | | These changed were made after pulling 10.2.30 from originOlivier Bertrand2019-11-2121-587/+578
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --------------------------------------------------------- - Temporarily fix MDEV-13782 by commenting out LIKE_FUNC i, CondFilter modified: storage/connect/ha_connect.cc - Make Rest available for MariaDB binary distributed versions. modified: storage/connect/CMakeLists.txt - Remove unused declaration modified: storage/connect/filter.h
| | | * | | | Fix missing declaration in tabrest.cpp causing compiling failure on LinuxOlivier Bertrand2019-11-161-1/+1
| | | | | | |
| | | * | | | =====================================================================Olivier Bertrand2019-11-1619-266/+412
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new CONNECT version 1.07 fully implements NOSQL support. It allows working on JSON or XML data retrieved as REST query results from all binary distributions of MariaDB when cpprestsdk is installed and the GetRest library is available. ===================================================================== - Make Rest available for MariaDB binary distributed versions. Change RestGet function so it can be called from a library. modified: storage/connect/CMakeLists.txt modified: storage/connect/restget.cpp modified: storage/connect/tabrest.cpp - Make column FLAG option available to discovery functions. modified: storage/connect/ha_connect.cc modified: storage/connect/plgdbsem.h - Update CONNECT version number and date. modified: storage/connect/ha_connect.cc - Move OEMColumns function from mycat.cc to reldef.cpp. modified: storage/connect/mycat.cc modified: storage/connect/reldef.cpp - Allocate tables as TABREF (was RELDEF) modified: storage/connect/mycat.cc modified: storage/connect/mycat.h - Fix MDEV-20845 by commenting out TIMEOUT setting. modified: storage/connect/myconn.cpp - Call DefineAM before calling GetColCatInfo. Column offset is now based on record format instead of table type. The RECFM_VCT format was added. This enables tables to specify the record format and is useful in particular for OEM tables. modified: storage/connect/plgdbsem.h modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabutil.cpp modified: storage/connect/tabutil.h modified: storage/connect/tabvct.cpp modified: storage/connect/xindex.cpp
| | * | | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-12-031-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | cleanup: remove always true condition to fix clang warningEugene Kosov2019-11-191-1/+1
| | | | | |
| * | | | | Lintian complains on spelling errorFaustin Lammler2019-12-023-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lintian check complains on spelling error: https://salsa.debian.org/mariadb-team/mariadb-10.3/-/jobs/95739
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2019-11-0120-812/+780
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-3120-812/+780
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote-tracking branch 'connect/10.2' into 10.2Oleksandr Byelkin2019-10-307-334/+319
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Fix wrong second parameter in snprintfOlivier Bertrand2019-10-161-2/+2
| | | | | |
| | | * | | Some small changes.Olivier Bertrand2019-10-164-297/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | =================== - Fix unhandled throws, add some trace + typo modified: storage/connect/jdbconn.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp
| | | * | | - Remove some incorrect compile flagsOlivier Bertrand2019-09-103-38/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just keep the /MDd flag but only for Windows Debug REST compile modified: storage/connect/CMakeLists.txt - Add a trace to EvalColumns modified: storage/connect/connect.cc - Remove a file not belonging to CONNECT deleted: rest.h
| | * | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2019-10-302-1/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2019-10-3032-1612/+2083
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix xml(2)_mult.test result mismatchOlivier Bertrand2019-08-242-8/+8
| | | | | |
| | | | * | In CONNECT version 1.6.10 NOSQL facility is enhanced by a new way to ↵Olivier Bertrand2019-08-2430-1610/+2086
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | retrieve NOSQL data. In addition to files and Mongo collections, JSON as well as XML and CSV data can be retrieved from the net as answers from REST queries. Because it uses and external package (cpprestsdk) this is currently available only to MariaDB servers compiled from source. -- Add the REST support when Microsoft Casablanca package (cpprestsdk) is installed. -- Add compile flags needed on Windows /MD or /MDd (debug) -- Also include some changes specific to MariaDB 10.3. modified: storage/connect/CMakeLists.txt -- Add conditional REST support -- Added string options HTTP and URI. -- Added added internal table type TAB_REST. modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/mycat.h modified: storage/connect/plgdbsem.h -- Add conditional code based on the preprocessor definition MARIADB -- This to be able to use the same code in CONNECT and EOM modules modified: storage/connect/osutil.h modified: storage/connect/tabrest.cpp -- Add files for the REST OEM module added: storage/connect/mini-global.h added: storage/connect/rest.def -- Fix MDEV-19648 Variable connect_conv_size doesn't change -- Change Variable wrong block parameter from 8169 to 1. -- Also change connect_conv_size default value to 1024. modified: storage/connect/ha_connect.cc -- Fix compilation error when ZIP is not supported modified: storage/connect/ha_connect.cc modified: storage/connect/tabfmt.cpp -- Replace PlugSetPath by some concat (crashed on Fedora) + typo modified: storage/connect/reldef.cpp -- Avoid possible buffer overflow -- In particular by the function ShowValue. modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/value.cpp modified: storage/connect/value.h -- Add some cast to avoid some compiler warnings modified: storage/connect/filamdbf.cpp -- Fix some C++ error modified: storage/connect/javaconn.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/plugutil.cpp -- Add some tracing + typo modified: storage/connect/mycat.cc modified: storage/connect/tabjson.cpp -- Add the xtrc tracing function modified: storage/connect/global.h modified: storage/connect/plugutil.cpp -- Modify tracing to use xtrc and some typo modified: storage/connect/array.cpp modified: storage/connect/block.h -- Miscellaneous Typo and warning suppressing changes modified: storage/connect/connect.cpp modified: storage/connect/connect.h modified: storage/connect/filamvct.cpp modified: storage/connect/inihandl.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/libdoc.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabtbl.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/user_connect.cc modified: storage/connect/user_connect.h -- Update failing test results and disbling modified: storage/connect/mysql-test/connect/disabled.def modified: storage/connect/mysql-test/connect/r/dir.result modified: storage/connect/mysql-test/connect/r/grant.result modified: storage/connect/mysql-test/connect/r/jdbc.result modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result modified: storage/connect/mysql-test/connect/r/xml.result modified: storage/connect/mysql-test/connect/r/xml2.result modified: storage/connect/mysql-test/connect/r/xml2_mult.result modified: storage/connect/mysql-test/connect/r/xml_mult.result -- Add an option modified: storage/connect/mysql-test/connect/t/grant.test
| | * | | | fix CONNECT engine to issue the correct error messageSergei Golubchik2019-10-2812-481/+460
| | | | | |
* | | | | | Merge 10.3 into 10.4Marko Mäkelä2019-10-101-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.2 into 10.3Marko Mäkelä2019-10-091-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix clang warningEugene Kosov2019-10-031-1/+1
| | | | | |
* | | | | | Removing obsolete register keywordDavid Carlier2019-09-211-1/+1
| | | | | |
View Lorry Controller Status