Commit graph

864 commits

Author SHA1 Message Date
Sergei Golubchik
06b7fce9f2 Merge branch '10.1' into 10.2 2016-09-09 08:33:08 +02:00
Sergei Golubchik
6820bf9ca9 do not quote numbers in the DEFAULT clause in SHOW CREATE 2016-08-27 16:59:11 +02:00
Sergei Golubchik
6b1863b830 Merge branch '10.0' into 10.1 2016-08-25 12:40:09 +02:00
Sergei Golubchik
2bd94951c6 Merge branch 'connect/10.0' into 10.0
1.04.0008
2016-08-10 19:58:42 +02:00
Olivier Bertrand
a2934d2710 - JdbcInterface: change return type of ...Field function
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
2016-08-10 18:27:31 +02:00
Olivier Bertrand
ec725089cf Change jdbc test to reflect girls.txt LF ending 2016-07-15 00:50:18 +02:00
Olivier Bertrand
44012db635 All changes made on 10.1 for last 11 commits 2016-07-14 20:12:22 +02:00
Sergei Golubchik
326a8dcd87 Merge branch '10.0' into 10.1 2016-07-13 12:09:59 +02:00
Sergei Golubchik
79fc519eed json_udf slowdown
don't call strlen() in the loop
2016-07-12 22:20:20 +02:00
Sergei Golubchik
5c764a0eb8 clarify ER_CANT_DROP_FIELD_OR_KEY
include the dropped object type
2016-07-02 14:52:20 +02:00
Sergei Golubchik
932646b1ff Merge branch '10.1' into 10.2 2016-06-30 16:38:05 +02:00
Sergei Golubchik
99e48cb1d9 restore ER_VIEW_CHECK_FAILED to be different from ER_CONSTRAINT_FAILED
collaterals:
* use %`s, not '%s'
* use correct SQLSTATE codes for these two errors
2016-06-30 11:43:02 +02:00
Michael Widenius
db7edfed17 MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard
MDEV-10134 Add full support for DEFAULT

- Added support for using tables with MySQL 5.7 virtual fields,
  including MySQL 5.7 syntax
- Better error messages also for old cases
- CREATE ... SELECT now also updates timestamp columns
- Blob can now have default values
- Added new system variable "check_constraint_checks", to turn of
  CHECK constraint checking if needed.
- Removed some engine independent tests in suite vcol to only test myisam
- Moved some tests from 'include' to 't'. Should some day be done for all tests.
- FRM version increased to 11 if one uses virtual fields or constraints
- Changed to use a bitmap to check if a field has got a value, instead of
  setting HAS_EXPLICIT_VALUE bit in field flags
- Expressions can now be up to 65K in total
- Ensure we are not refering to uninitialized fields when handling virtual fields or defaults
- Changed check_vcol_func_processor() to return a bitmap of used types
- Had to change some functions that calculated cached value in fix_fields to do
  this in val() or getdate() instead.
- store_now_in_TIME() now takes a THD argument
- fill_record() now updates default values
- Add a lookahead for NOT NULL, to be able to handle DEFAULT 1+1 NOT NULL
- Automatically generate a name for constraints that doesn't have a name
- Added support for ALTER TABLE DROP CONSTRAINT
- Ensure that partition functions register virtual fields used. This fixes
  some bugs when using virtual fields in a partitioning function
2016-06-30 11:43:02 +02:00
Sergei Golubchik
736f821c42 Merge branch 'connect/10.1' into 10.1 2016-06-28 22:12:50 +02:00
Sergei Golubchik
3361aee591 Merge branch '10.0' into 10.1 2016-06-28 22:01:55 +02:00
Sergei Golubchik
6dfe3fb2bb remove incorrect .gitattributes 2016-06-28 10:23:24 +02:00
Monty
4dc5075860 Fixed compiler warnings and test failures found by buildbot
Fixed ccfilter to detect errors where the column is included in the error message
2016-06-24 02:25:14 +03:00
Monty
838205f0bb Fixed compiler warnings and test failures found by buildbot 2016-06-22 22:04:55 +03:00
Sergei Golubchik
e167806196 compilation failures
windows: use GetProcAddress() to access internal server data structures
rhel5: CONNECT-JDBC requires at least Java 1.6
2016-06-22 16:12:50 +02:00
Sergei Golubchik
f9b5acfb0c Merge branch 'bb-10.0-serg' into 10.0 2016-06-22 10:54:19 +02:00
Vladislav Vaintroub
69f1a3215e Replace dynamic loading of mysqld.exe data for plugins, replace with MYSQL_PLUGIN_IMPORT 2016-06-21 19:20:11 +02:00
Sergey Vojtovich
15313216bf MDEV-9993 - connect.json_udf_bin valgrind warnings
"result" may be uninitialized when json_set_item() is called directly.
2016-06-21 17:04:57 +04:00
Olivier Bertrand
7e64b07968 - Add column pattern and table type argument to catalog tables
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
2016-06-20 16:37:57 +02:00
Olivier Bertrand
0a96c9c4aa - Possibly fix MDEV-10179 Reset remote tables when re-opening
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
2016-06-13 14:28:02 +02:00
Olivier Bertrand
74009534a1 - Possibly fix MDEV-10179 Reset remote tables when re-opening
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
2016-06-13 12:58:24 +02:00
Otto Kekäläinen
effbe7dd7b General spell fixing in comments and strings 2016-06-08 14:17:23 +03:00
Olivier Bertrand
a9ac3506d2 git90.msg + git91.msg 2016-06-02 23:36:19 +02:00
Olivier Bertrand
613680a041 - Fix MDEV-10111 Reconize unsigned integers when creating tables via srcdef
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
2016-06-02 22:11:08 +02:00
Olivier Bertrand
ead4147b13 - Reconize the JDBC type -7 (BIT)
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
2016-05-26 18:48:47 +02:00
Olivier Bertrand
afa4657fd3 - Fix failing json_udf_bin test when --ps
modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/disabled.def
2016-05-24 23:57:06 +02:00
Olivier Bertrand
809422838d - Alternative versions of the java JdbcInterface
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'
2016-05-24 11:29:12 +02:00
Olivier Bertrand
e905abf91b - New version of the java JdbcInterface
modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

- Ignore *.tlog and .res files
  modified:   .gitignore
2016-05-23 15:17:43 +02:00
Olivier Bertrand
0dae2932f4 - New version of the java JdbcInterface
modified:   storage/connect/JdbcInterface.class
  modified:   storage/connect/JdbcInterface.java

- Ignore *.tlog and .res files
  modified:   .gitignore
2016-05-23 15:08:51 +02:00
Olivier Bertrand
f8bc587c1a Merge branch '10.1' of https://github.com/MariaDB/server into ob-10.1 2016-05-22 14:49:14 +02:00
Olivier Bertrand
9a5c586024 Merge branch '10.0' of https://github.com/MariaDB/server into 10.0 2016-05-22 11:13:10 +02:00
Olivier Bertrand
d25fd437c4 - Fix wrong return from ExecuteQuery
modified:   storage/connect/jdbconn.cpp

- Suppress GCC warning
  modified:   storage/connect/tabjdbc.cpp
2016-05-21 14:56:47 +02:00
Olivier Bertrand
77dd5ece06 - Fix wrong return from ExecuteQuery
modified:   storage/connect/jdbconn.cpp

- Suppress GCC warning
  modified:   storage/connect/tabjdbc.cpp
2016-05-21 14:28:21 +02:00
Olivier Bertrand
c92f2606ea Commit changes made from 10.1 2016-05-21 12:11:27 +02:00
Olivier Bertrand
a982f59b9b - JDBC using separate jmethodID for data types
Some DEBUG tests
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
2016-05-21 11:56:59 +02:00
Olivier Bertrand
2f2797e52f - JDBC tables can be connected via foreign server wrapper
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
2016-05-20 00:18:29 +02:00
Olivier Bertrand
4a1ffc3853 Add forgotten changes made on 10.1 2016-05-12 23:26:40 +02:00
Olivier Bertrand
5af076e564 Add all changes made on 10.1 2016-05-12 23:08:22 +02:00
Olivier Bertrand
7972a45b43 - Remove REQUIRED option that caused compilation to fail
Remove JVM_LIBRARY (is now dynamically loaded at run time)
  modified:   storage/connect/CMakeLists.txt
2016-05-12 17:22:45 +02:00
Olivier Bertrand
0f5ced1dd5 - Fix some typo ... causing crash!
modified:   storage/connect/jdbconn.cpp
2016-05-12 15:41:21 +02:00
Olivier Bertrand
6aa163bce8 - Continue working on the JDBC table type
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
2016-05-12 12:20:52 +02:00
Olivier Bertrand
2323cf0033 - Make the JVM lib dynamically loaded
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
2016-05-09 17:26:50 +02:00
Olivier Bertrand
025decfc38 - Remove gcc compiling errors and warnings
modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/tabjdbc.h
2016-05-06 01:07:14 +02:00
Sergei Golubchik
ea195d372b MDEV-9949 Connect Engine: long SRCDEF leads to broken table
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
2016-05-05 01:05:05 +02:00
Sergei Golubchik
357f4d832b Merge branch 'connect/10.1' into 10.1 2016-05-05 01:04:05 +02:00
Olivier Bertrand
80a204f27e - Try to fix MDEV-9950 (not tested yet)
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
2016-05-05 01:03:26 +02:00