summaryrefslogtreecommitdiff
path: root/storage/connect
Commit message (Collapse)AuthorAgeFilesLines
* CONNECT: compilation fixSergei Golubchik2017-09-211-1/+1
| | | | | tabtyp was defined under ODBC_SUPPORT, but used outside of it too (under JDBC_SUPPORT).
* connect fixes after-mergeSergei Golubchik2017-09-204-5/+5
| | | | disable Mongo in 10.0, compiler warnings.
* Fix fall-through warningVicențiu Ciorbaru2017-09-191-1/+1
|
* Fix connect merge problemsVicențiu Ciorbaru2017-09-194-51/+9
| | | | | | * CMakeLists.txt erroneous duplicated lines. * Unneded differences in tabjson.cpp * Unneded space differences in jdbconn.{cpp|h}
* Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-09-19149-3188/+42806
| | | | This is a squashed merge.
* CONNECT engine: install ha_connect.libVladislav Vaintroub2017-08-231-1/+14
|
* MDEV-13630 : dont install connect-specific JAR files if connect is not built.Vladislav Vaintroub2017-08-231-7/+15
|
* Merge connect/10.0 into 10.0Vicențiu Ciorbaru2017-08-0152-482/+1001
| | | | | Squash all connect/10.0's commits into one and keep only changes from storage/connect directory.
* Connect engine is GammaSergei Golubchik2017-07-221-1/+1
|
* compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
|
* Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-1815-22/+36
|\
| * Silence bogus GCC 7 warnings -Wimplicit-fallthroughMarko Mäkelä2017-05-1715-13/+27
| | | | | | | | | | | | | | | | Do not silence uncertain cases, or fix any bugs. The only functional change should be that ha_federated::extra() is not calling DBUG_PRINT to report an unhandled case for HA_EXTRA_PREPARE_FOR_DROP.
* | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-05-16102-4083/+3563
|\ \ | |/ |/|
| * MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)Olivier Bertrand2017-05-121-1/+1
| |
| * Fix failing test connect.json for MariaDB 10.0Olivier Bertrand2017-05-124-14/+8
| | | | | | | | | | | | | | | | Suppressing Uri and dsn from json tables (was MGO) modified: storage/connect/ha_connect.cc modified: storage/connect/tabdos.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h
| * Fix wrong value of JSON columnOlivier Bertrand2017-05-1199-3413/+2406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When null and the column is NOT NULL the value was not reset. modified: storage/connect/tabjson.cpp Fix converting bstr_t string to set error message modified: storage/connect/domdoc.cpp Fix MDEV-12768: -Wformat-overflow compile warnings modified: storage/connect/global.h modified: storage/connect/jsonudf.cpp modified: storage/connect/plugutil.cpp modified: storage/connect/tabvct.cpp Typo (in external_lock) modified: storage/connect/ha_connect.cc Remove some warnings modified: storage/connect/odbconn.cpp modified: storage/connect/tabmysql.cpp Add MEM_RESERVE flag to virtualAlloc modified: storage/connect/plgdbutl.cpp Fix MDEV-12573: Accept=1 may show incorrect value for NULL column in CONNECT TBL modified: storage/connect/tabutil.cpp Fix wrong setting of key size when greater than 2G modified: storage/connect/xindex.cpp Fixing MDEV-12149: compile errors on Windows with /Zc:strictStrings Introduce typedef PCSZ and replace PSZ by it where it matters All done on CONNECT but compile still fails because of an included system file modified: storage/connect/array.cpp modified: storage/connect/catalog.h modified: storage/connect/colblk.cpp modified: storage/connect/colblk.h modified: storage/connect/connect.cc modified: storage/connect/domdoc.cpp modified: storage/connect/domdoc.h modified: storage/connect/filamdbf.cpp modified: storage/connect/filamdbf.h modified: storage/connect/filamfix.cpp modified: storage/connect/filamgz.cpp modified: storage/connect/filamtxt.h modified: storage/connect/filamvct.cpp modified: storage/connect/filamvct.h modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/jdbccat.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/json.cpp modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h modified: storage/connect/libdoc.cpp modified: storage/connect/macutil.cpp modified: storage/connect/myconn.cpp modified: storage/connect/myutil.cpp modified: storage/connect/myutil.h modified: storage/connect/odbccat.h modified: storage/connect/odbconn.cpp modified: storage/connect/odbconn.h modified: storage/connect/os.h modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/plgxml.cpp modified: storage/connect/plgxml.h modified: storage/connect/plugutil.cpp modified: storage/connect/preparse.h modified: storage/connect/reldef.cpp modified: storage/connect/reldef.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfix.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabfmt.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/table.cpp modified: storage/connect/tabmac.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmul.h modified: storage/connect/tabmysql.cpp modified: storage/connect/tabmysql.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h modified: storage/connect/tabpivot.cpp modified: storage/connect/tabpivot.h modified: storage/connect/tabsys.cpp modified: storage/connect/tabsys.h modified: storage/connect/tabutil.cpp modified: storage/connect/tabutil.h modified: storage/connect/tabvir.cpp modified: storage/connect/tabvir.h modified: storage/connect/tabwmi.cpp modified: storage/connect/tabwmi.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h modified: storage/connect/tabzip.cpp modified: storage/connect/tabzip.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/xobject.cpp modified: storage/connect/xobject.h modified: storage/connect/xtable.h Fix MDEV-12603 Insert replaces values in ZIP file modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h Fix MDEV-12686 Handle null in json Fix MDEV-12688 Insert does not handle type TINYINT modified: storage/connect/json.cpp modified: storage/connect/tabjson.cpp Fix MDEV-12653 Cannot add index for ZIP CONNECT table modified: storage/connect/filamzip.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/xindex.cpp
| * Fix MDEV-12603 Insert replaces values in ZIP fileOlivier Bertrand2017-05-064-21/+80
| | | | | | | | | | | | | | | | | | | | modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h Fix MDEV-12686 Handle null in json Fix MDEV-12688 Insert does not handle type TINYINT modified: storage/connect/json.cpp modified: storage/connect/tabjson.cpp
| * Fix MDEV-12653 Cannot add index for ZIP CONNECT tableOlivier Bertrand2017-05-046-11/+19
| | | | | | | | | | | | | | | | | | modified: storage/connect/filamzip.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/xindex.cpp
| * Disable json testsOlivier Bertrand2017-05-031-2/+2
| |
| * Fix MDEV-12587 MariaDB CONNECT DIR TypeOlivier Bertrand2017-05-039-50/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Subfolder Option: SELECT Query Never Ends modified: storage/connect/tabmul.cpp modified: storage/connect/tabmul.h Work on MDEV-12667 Crash when using JSON tables modified: storage/connect/connect.cc modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/plgdbutl.cpp Change Base offset for DIR tables on Linux modified: storage/connect/reldef.cpp
| * Fix MDEV-12631 valgrind warning for zipped tablesOlivier Bertrand2017-04-291-4/+10
| | | | | | | | modified: storage/connect/filamzip.cpp
| * Fix MDEV-12520: Decimal values can be truncated for JDBC tablesOlivier Bertrand2017-04-222-2/+4
| | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp Fix bug. Date value was null when retrieved from a json expanded array. modified: storage/connect/tabjson.cpp
| * Fix crash when a line is not ended by \n.Olivier Bertrand2017-03-285-27/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/filamap.cpp Add specifying a password when reading zipped tables. modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h Try Vaintroub suggestion modified: storage/connect/mysql-test/connect/t/jdbc.test
| * Fix MDEV-12220: Crash when doing UPDATE or DELETE on an externalOlivier Bertrand2017-03-183-12/+37
| | | | | | | | | | | | | | | | | | | | | | table (ODBC, JDBC, MYSQL) with a WHERE clause on an indexed column. Also fix a bugs in TDBEXT::MakeCommand (use of uninitialised Quote) Add in this function the eventual Schema (database) prefixing. modified: storage/connect/connect.cc modified: storage/connect/tabext.cpp Typo modified: storage/connect/tabjdbc.h
| * Commit the 2 last commits merged from 10.1Olivier Bertrand2017-03-115-291/+455
| |
| * Fix MDEV-12142 crash when creating CSV tableOlivier Bertrand2017-03-0638-1508/+1670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was an unprepared longjmp (now throw) Also fix a wrong calculation of To_Line sometimes causing a crash because of buffer overflow. modified: storage/connect/tabdos.cpp Fix a wrong setting of USER for JDBC tables in connect_assisted_discovery. Update jdbc_new.test after that fix, which changed errors. modified: storage/connect/ha_connect.cc modified: storage/connect/mysql-test/connect/r/jdbc_new.result modified: storage/connect/mysql-test/connect/t/jdbc_new.test Make using try/catch/throw the default option modified: storage/connect/CMakeLists.txt Typo modified: storage/connect/xindex.cpp Replace setjmp-longjmp's by try_catch-throw modified: storage/connect/CMakeLists.txt modified: storage/connect/array.cpp modified: storage/connect/blkfil.cpp modified: storage/connect/colblk.cpp modified: storage/connect/connect.cc modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/filter.cpp modified: storage/connect/global.h modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/json.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/odbconn.cpp modified: storage/connect/osutil.c modified: storage/connect/plgdbutl.cpp deleted: storage/connect/plugutil.c added: storage/connect/plugutil.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabmul.cpp modified: storage/connect/tabmul.h modified: storage/connect/tabmysql.cpp modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h modified: storage/connect/tabpivot.cpp modified: storage/connect/tabsys.cpp modified: storage/connect/tabvct.cpp modified: storage/connect/tabvir.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/valblk.cpp modified: storage/connect/value.cpp modified: storage/connect/xindex.cpp modified: storage/connect/xobject.cpp
* | MDEV-10936 CONNECT engine JDBC type can't find JdbcInterfaceSergei Golubchik2017-05-151-1/+1
| | | | | | | | | | | | Don't use instal_jar() from Use_Java.cmake - at least in CentOS 7 (cmake 2.8.12.2) it doesn't yet support the COMPONENT option.
* | MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warningSergei Golubchik2017-05-153-3/+3
| | | | | | | | | | remove useless checks and a couple of others
* | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-03-0578-1671/+3966
|\ \ | |/
| * Update version number and dateOlivier Bertrand2017-03-029-36/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc Add conditional SE exception support modified: storage/connect/json.cpp modified: storage/connect/plgdbutl.cpp Change %p in %x in some sprintf functions. This to avoid some compiler warnings. modified: storage/connect/tabwmi.cpp modified: storage/connect/tabxml.cpp modified: storage/connect/value.h Add JavaWrappers.jar to the class path modified: storage/connect/jdbconn.cpp Fix wrong declare (char *buf[256]; --> char buf[256];) modified: storage/connect/xindex.cpp
| * Fix crashing when joining two JDBC tables..Olivier Bertrand2017-02-241-0/+3
| | | | | | | | | | Was in close (the virtual machine could have been detached. modified: storage/connect/jdbconn.cpp
| * All changes made on 10.1Olivier Bertrand2017-02-1656-1460/+2137
| |
| * Commit changes made for version 10.1Olivier Bertrand2017-01-1730-185/+1740
| |
* | Fixed compiler warningsMonty2017-02-283-22/+19
| | | | | | | | | | | | | | - Removed not used variables - Added __attribute__() - Added static to some local functions (gcc 5.4 gives a warning for external functions without an external definition)
* | connect zip bug fixSergei Golubchik2017-01-171-1/+1
| |
* | connect: compilation errors and few obvious bugsSergei Golubchik2017-01-172-6/+7
|/
* Modified version numberOlivier Bertrand2016-12-251-1/+1
|
* Fix some XML table type bugs:Olivier Bertrand2016-12-2317-278/+604
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - in DOMNODELIST::DropItem if (Listp == NULL || Listp->length <= n) return true; is wrong, should be: if (Listp == NULL || Listp->length < n) return true; - Crash in discovery with libxml2 in XMLColumns because: if (!tdp->Usedom) // nl was destroyed vp->nl = vp->pn->GetChildElements(g); is executed with vp->pn uninitialized. Fixed by adding: vp->pn = node; line 264. -In discovery with libxml2 some columns are not found. Because list was not recovered properly, nodes being modified and not reallocated. Fixed lines 214 and 277. modified: storage/connect/domdoc.cpp modified: storage/connect/tabxml.cpp Add support for zipped table files modified: storage/connect/domdoc.cpp modified: storage/connect/domdoc.h modified: storage/connect/filamap.cpp modified: storage/connect/filamap.h modified: storage/connect/filamzip.cpp modified: storage/connect/filamzip.h modified: storage/connect/ha_connect.cc modified: storage/connect/libdoc.cpp modified: storage/connect/plgdbutl.cpp modified: storage/connect/plgxml.cpp modified: storage/connect/plgxml.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabxml.cpp
* - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1410-97/+64
| | | | | | | | | | | | Enable using multiple zip files modified: storage/connect/filamzip.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/mycat.h modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp
* - MDEV-11295: developing handling files contained in ZIP file.Olivier Bertrand2016-12-1222-125/+6579
| | | | | | | | | | | | | | | | | | | | | | | | | A first experimental and limited implementation. modified: storage/connect/CMakeLists.txt modified: storage/connect/filamap.cpp new file: storage/connect/filamzip.cpp new file: storage/connect/filamzip.h modified: storage/connect/ha_connect.cc new file: storage/connect/ioapi.c new file: storage/connect/ioapi.h modified: storage/connect/mycat.cc modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfmt.cpp modified: storage/connect/tabfmt.h modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h new file: storage/connect/tabzip.cpp new file: storage/connect/tabzip.h new file: storage/connect/unzip.c new file: storage/connect/unzip.h new file: storage/connect/zip.c
* - MDEV-11366 SIGBUS errors in Connect Storage Engine for ArmHF and MIPS.Olivier Bertrand2016-12-0212-151/+197
| | | | | | | | | | | | | | | | | | | | | Fix includes launchpad fix plus more to cover writing BIN tables. modified: storage/connect/tabfix.cpp modified: storage/connect/value.cpp modified: storage/connect/value.h - Typo: Change the name of filamzip to filamgz to prepare future ZIP tables. modified: storage/connect/CMakeLists.txt added: storage/connect/filamgz.cpp added: storage/connect/filamgz.h deleted: storage/connect/filamzip.cpp deleted: storage/connect/filamzip.h modified: storage/connect/plgdbsem.h modified: storage/connect/reldef.cpp modified: storage/connect/tabdos.cpp modified: storage/connect/tabdos.h modified: storage/connect/tabfix.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/tabjson.cpp
* - Fix null pointer java error when connecting to jdbc:drill driver.Olivier Bertrand2016-11-273-0/+3
| | | | | | | By setting the context class loader. modified: storage/connect/JavaWrappers.jar modified: storage/connect/JdbcInterface.java modified: storage/connect/mysql-test/connect/std_data/JdbcMariaDB.jar
* - MDEV-11051 place Java classes ApacheInterface and JdbcInterface into ↵Olivier Bertrand2016-11-1410-71/+109
| | | | | | | | | | | | single jar file. Try to fix the INSTALL command. modified: storage/connect/CMakeLists.txt - Make some JDBC tests available on Windows modified: storage/connect/mysql-test/connect/t/jdbc.test modified: storage/connect/mysql-test/connect/t/jdbc_new.test added: storage/connect/mysql-test/connect/t/windows.inc
* - Fix MDEV-11234. Escape quoting character. Should be doubled.Olivier Bertrand2016-11-0614-50/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it is also possible to escape it by a backslash. modified: storage/connect/tabfmt.cpp - Prepare making VEC table type support conditional. VEC tables might be unsupported in future versions modified: storage/connect/CMakeLists.txt modified: storage/connect/mycat.cc modified: storage/connect/reldef.cpp modified: storage/connect/xindex.cpp - MDEV-11067 suggested to add configuration support to the Apache wrapper. Was added but commented out until prooved it is really useful. modified: storage/connect/ApacheInterface.java modified: storage/connect/ha_connect.cc modified: storage/connect/jdbccat.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h - Remove useless members. modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h - New UDF countin. modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h
* - Fix MDEV-10950. Null values not retrieved for numeric types.Olivier Bertrand2016-10-143-15/+29
| | | | | | | Now the null is tested using the result set getObject method. modified: storage/connect/JdbcInterface.java modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h
* - Fix MDEV-10948. Syntax error on quoted JDBC tables.Olivier Bertrand2016-10-053-4/+42
| | | | | | | | Was because the quoting character was always '"' instead of being retrieve from the JDBC source. modified: storage/connect/JdbcInterface.java modified: storage/connect/jdbconn.cpp modified: storage/connect/tabjdbc.cpp
* - Working on MDEV-10525. Lrecl mismatch on DBF filesOlivier Bertrand2016-09-163-20/+74
| | | | | | modified: storage/connect/filamdbf.cpp modified: storage/connect/filamdbf.h modified: storage/connect/reldef.cpp
* Merge branch '10.0' of https://github.com/MariaDB/server into ob-10.0Olivier Bertrand2016-09-051-25/+0
|\
| * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-08-1034-1708/+962
| |\ | | | | | | | | | 1.04.0008
| * | json_udf slowdownSergei Golubchik2016-07-121-2/+2
| | | | | | | | | | | | don't call strlen() in the loop
View Lorry Controller Status