summaryrefslogtreecommitdiff
path: root/storage/connect
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-08-2532-1649/+889
|\
| * Merge branch 'connect/10.0' into 10.0Sergei Golubchik2016-08-1034-1708/+962
| |\ | | | | | | | | | 1.04.0008
| | * - JdbcInterface: change return type of ...Field functionOlivier Bertrand2016-08-107-33/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/JdbcInterface.java - Change Version number and date modified: storage/connect/ha_connect.cc - Implement the test on connect_type_conv YES/NO modified: storage/connect/jdbconn.cpp modified: storage/connect/odbconn.cpp - Fix MDEV-10520. Local schema was confused with remote schema modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabodbc.cpp - Fix crash when using mapped indices. Was trying to write in a mapped file declared as read only. modified: storage/connect/xindex.cpp
| | * Change jdbc test to reflect girls.txt LF endingOlivier Bertrand2016-07-152-2/+2
| | |
| | * All changes made on 10.1 for last 11 commitsOlivier Bertrand2016-07-1433-1677/+910
| | |
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-07-131-2/+2
|\ \ \ | |/ /
| * | json_udf slowdownSergei Golubchik2016-07-121-2/+2
| | | | | | | | | | | | don't call strlen() in the loop
* | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-06-2812-630/+839
|\ \ \
| * | | - Add column pattern and table type argument to catalog tablesOlivier Bertrand2016-06-2011-61/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/odbccat.h modified: storage/connect/odbconn.cpp modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h modified: storage/connect/tabodbc.cpp modified: storage/connect/tabodbc.h - Avoid longjump in AllocCatInfo functions modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/odbconn.cpp - Change GetColumns error return value from 0 to -1 modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java
| * | | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-137-15/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | - Fix MDEV-10111 Reconize unsigned integers when creating tables via srcdefOlivier Bertrand2016-06-024-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/myconn.cpp - Fix MDEV-10136 crash on SELECT jsonget_string(NULL, 'a') modified: storage/connect/jsonudf.cpp - Assert longjmp initialized when suballocating modified: storage/connect/plugutil.c - Avoid crash in MakeRecord when table->vcol_set isnull (trace > 1) modified: storage/connect/ha_connect.cc
| * | | - Reconize the JDBC type -7 (BIT)Olivier Bertrand2016-05-2623-737/+1153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp - Add the global variable connect_java_wrapper This enables to use different wrappers modified: storage/connect/CMakeLists.txt renamed: storage/connect/java/ap/JdbcInterface.class -> storage/connect/JdbcApacheInterface.class renamed: storage/connect/java/ap/JdbcInterface.java -> storage/connect/JdbcApacheInterface.java renamed: storage/connect/java/ds/JdbcInterface.class -> storage/connect/JdbcDSInterface.class renamed: storage/connect/java/ds/JdbcInterface.java -> storage/connect/JdbcDSInterface.java modified: storage/connect/ha_connect.cc deleted: storage/connect/java/std/JdbcInterface.class deleted: storage/connect/java/std/JdbcInterface.java modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h - Add JDBC tests (disabled) modified: storage/connect/mysql-test/connect/disabled.def new file: storage/connect/mysql-test/connect/r/jdbc.result new file: storage/connect/mysql-test/connect/r/jdbc_new.result new file: storage/connect/mysql-test/connect/r/jdbc_oracle.result new file: storage/connect/mysql-test/connect/r/jdbc_postgresql.result new file: storage/connect/mysql-test/connect/std_data/girls.txt new file: storage/connect/mysql-test/connect/t/jdbc.test new file: storage/connect/mysql-test/connect/t/jdbc_new.test new file: storage/connect/mysql-test/connect/t/jdbc_oracle.test new file: storage/connect/mysql-test/connect/t/jdbc_postgresql.test new file: storage/connect/mysql-test/connect/t/jdbconn.inc new file: storage/connect/mysql-test/connect/t/jdbconn_cleanup.inc - Typo modified: storage/connect/jsonudf.cpp
| * | | - Fix failing json_udf_bin test when --psOlivier Bertrand2016-05-242-42/+240
| | | | | | | | | | | | | | | | | | | | modified: storage/connect/jsonudf.cpp modified: storage/connect/mysql-test/connect/disabled.def
| * | | - Alternative versions of the java JdbcInterfaceOlivier Bertrand2016-05-246-0/+2164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of them (ap/ds) enable connection to a DataSource added 'storage/connect/java/ap/JdbcInterface.class' added 'storage/connect/java/ap/JdbcInterface.java' added 'storage/connect/java/ds/JdbcInterface.class' added 'storage/connect/java/ds/JdbcInterface.java' added 'storage/connect/java/std/JdbcInterface.class' added 'storage/connect/java/std/JdbcInterface.java'
| * | | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-232-78/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java - Ignore *.tlog and .res files modified: .gitignore
| * | | Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1Olivier Bertrand2016-05-2234-2085/+176
| |\ \ \
| * | | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp - Suppress GCC warning modified: storage/connect/tabjdbc.cpp
| * | | | - JDBC using separate jmethodID for data typesOlivier Bertrand2016-05-212-35/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some DEBUG tests modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h
| * | | | - JDBC tables can be connected via foreign server wrapperOlivier Bertrand2016-05-205-297/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign the handling of errors and exceptions modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h
| * | | | - Remove REQUIRED option that caused compilation to failOlivier Bertrand2016-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Remove JVM_LIBRARY (is now dynamically loaded at run time) modified: storage/connect/CMakeLists.txt
| * | | | - Fix some typo ... causing crash!Olivier Bertrand2016-05-121-2/+2
| | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp
| * | | | - Continue working on the JDBC table typeOlivier Bertrand2016-05-129-141/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress the jpath option add the connect_jvm_path and connect_class_path global variables 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 - Add the envar UDF modified: storage/connect/jsonudf.cpp modified: storage/connect/jsonudf.h - Fix MDEV-9950 modified: storage/connect/ha_connect.cc modified: storage/connect/plgdbutl.cpp
| * | | | - Make the JVM lib dynamically loadedOlivier Bertrand2016-05-094-112/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the CONNECT storage engine usable when Java JDK is not installed. modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h - Typo modified: storage/connect/reldef.cpp
| * | | | - Remove gcc compiling errors and warningsOlivier Bertrand2016-05-062-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp modified: storage/connect/tabjdbc.h
| * | | | - Try to fix MDEV-9950 (not tested yet)Olivier Bertrand2016-05-059-81/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/plgdbutl.cpp - Fix Mdev-9997 (Sergey Vojtovitch) modified: storage/connect/inihandl.c - Try to have the JDBC type compiled by CMake modified: storage/connect/CMakeLists.txt - Fixing some bugs in the JDBC table type Use the CONNECTION option for the URL modified: storage/connect/ha_connect.cc modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp - Add the JdbcInterface.class to the project new file: storage/connect/JdbcInterface.class
| * | | | - Add the JdbcInterface.java to the projectOlivier Bertrand2016-04-271-0/+639
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added: storage/connect/JdbcInterface.java - Add *.java to be handled modified: .gitattributes
| * | | | - Add the JDBC table type compilation for CMAKE.Olivier Bertrand2016-04-272-55/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/CMakeLists.txt - Fix MDEV-9993 modified: storage/connect/jsonudf.cpp
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-2832-152/+4024
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | remove incorrect .gitattributesSergei Golubchik2016-06-281-25/+0
| | | |
| * | | compilation failuresSergei Golubchik2016-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | windows: use GetProcAddress() to access internal server data structures rhel5: CONNECT-JDBC requires at least Java 1.6
| * | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2016-06-2241-239/+8787
| |\ \ \ | | | |/ | | |/|
| | * | - Possibly fix MDEV-10179 Reset remote tables when re-openingOlivier Bertrand2016-06-1318-11/+1144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0213-74/+2039
| | | |
| | * | - New version of the java JdbcInterfaceOlivier Bertrand2016-05-232-78/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/JdbcInterface.class modified: storage/connect/JdbcInterface.java - Ignore *.tlog and .res files modified: .gitignore
| | * | Merge branch '10.0' of https://github.com/MariaDB/server into 10.0Olivier Bertrand2016-05-2225-87/+1653
| | |\ \
| | * | | - Fix wrong return from ExecuteQueryOlivier Bertrand2016-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp - Suppress GCC warning modified: storage/connect/tabjdbc.cpp
| | * | | Commit changes made from 10.1Olivier Bertrand2016-05-215-332/+453
| | | | |
| | * | | Add forgotten changes made on 10.1Olivier Bertrand2016-05-124-12/+26
| | | | |
| | * | | Add all changes made on 10.1Olivier Bertrand2016-05-1214-159/+5398
| | | | |
| * | | | Replace dynamic loading of mysqld.exe data for plugins, replace with ↵Vladislav Vaintroub2016-06-211-13/+1
| | | | | | | | | | | | | | | | | | | | MYSQL_PLUGIN_IMPORT
| * | | | MDEV-9993 - connect.json_udf_bin valgrind warningsSergey Vojtovich2016-06-211-15/+12
| | |/ / | |/| | | | | | | | | | "result" may be uninitialized when json_set_item() is called directly.
* | | | MDEV-9949 Connect Engine: long SRCDEF leads to broken tableSergei Golubchik2016-05-055-7/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two bugs here: * the server could create an frm (with a long attribute value) that it could not read back * Connect engine opened files from inside DROP TABLE and was ignoring the error (correctly) but was not hiding it from the server (incorrectly). This caused a crash later when DROP TABLE was finishing successfully while stmt_da already have seen an error. Also added a text case for MDEV-7935 CREATE TABLE ... AS SELECT ... can cause a Server crash (Assertion `0' in Protocol::end_statement) because Connect stopped clearing the error status in stmt_da as a fix for MDEV-7935
* | | | Merge branch 'connect/10.1' into 10.1Sergei Golubchik2016-05-0515-108/+4614
|\ \ \ \ | | |_|/ | |/| |
| * | | - Add the use of prepared statement in the JDBC table type.Olivier Bertrand2016-04-264-131/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/jdbconn.cpp modified: storage/connect/jdbconn.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabjdbc.h
| * | | - Fix an error causing MYSQL table to fail saying "no result set"Olivier Bertrand2016-04-249-27/+509
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when joining a table to a MYSQL indexed table. modified: storage/connect/myconn.cpp modified: storage/connect/myconn.h modified: storage/connect/tabmysql.cpp - Fix an error causing JDBC table to fail saying when joining a table to a JDBC indexed table. added: storage/connect/tabjdbc.cpp - Add more tests to the mysql_index.test file modified: storage/connect/mysql-test/connect/r/mysql_index.result modified: storage/connect/mysql-test/connect/t/mysql_index.test - Add dummy JDBC support (NIY) modified: storage/connect/CMakeLists.txt - Typo modified: storage/federatedx/ha_federatedx.cc
| * | | - Fix and error causing remote indexing to fail when for not unique index.Olivier Bertrand2016-04-2314-94/+4444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was experienced with MYSQL, ODBC and JDBC tables. modified: storage/connect/connect.cc - Fix MDEV-9966 (zero lines returned) modified: storage/connect/ha_connect.cc modified: storage/federatedx/ha_federatedx.cc - Typo modified: storage/connect/odbconn.cpp modified: storage/connect/reldef.cpp modified: storage/connect/tabmysql.cpp - Add new table type JDBC modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/plgdbsem.h modified: storage/connect/plgdbutl.cpp modified: storage/connect/tabodbc.cpp added: storage/connect/jdbccat.h added: storage/connect/jdbconn.cpp added: storage/connect/jdbconn.h added: storage/connect/tabjdbc.cpp added: storage/connect/tabjdbc.h
| * | | - Fix MDEV-9779. Avoid buffer overflow when setting partname.Olivier Bertrand2016-03-252-11/+13
| | | | | | | | | | | | | | | | | | | | modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h
| * | | - Fix MDEV-9779. Connection was not recognized in the option list.Olivier Bertrand2016-03-243-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a regression bug. modified: storage/connect/ha_connect.cc modified: storage/connect/mysql-test/connect/r/part_table.result modified: storage/connect/mysql-test/connect/t/part_table.test
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-0417-78/+516
|\ \ \ \ | | |/ / | |/| |
| * | | Fix msxml6 search in Connect engine on Windows,Vladislav Vaintroub2016-04-271-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | as it fails on new builders. msxml6 is found on all Windows we support, thus there is no reason to search for it.
View Lorry Controller Status