mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
175065 commits 2778 branches 343 tags 1.6 GiB
Commit graph

864 commits

Author SHA1 Message Date
Sergei Golubchik
87e3e67f43 Merge branch '10.0' into 10.1 2016-05-04 15:23:26 +02:00
Vladislav Vaintroub
e5810727a9 Fix msxml6 search in Connect engine on Windows, 
as it fails on new builders.

msxml6 is found on all Windows we support, thus there is no reason to
search for it.
 2016-04-27 18:16:03 +02:00
Olivier Bertrand
bbdeb911b8 - Add the JdbcInterface.java to the project 
added:   storage/connect/JdbcInterface.java

- Add *.java to be handled
  modified:   .gitattributes
 2016-04-27 12:57:27 +02:00
Olivier Bertrand
7b7414c0ef - Add the JDBC table type compilation for CMAKE. 
modified:   storage/connect/CMakeLists.txt

- Fix MDEV-9993
  modified:   storage/connect/jsonudf.cpp
 2016-04-27 12:36:55 +02:00
Sergei Golubchik
8b1563eac8 Merge branch 'connect/10.0' into 10.0 
1.04.0006
 2016-04-26 23:48:18 +02:00
Sergei Golubchik
4995bcffad MDEV-9610 Trigger on normal table can't insert into CONNECT engine table - Access Denied 
in case of prelocking, don't check table->grant.privilege
in handler::external_lock(), do it in
handler::start_stmt().
 2016-04-26 21:03:40 +02:00
Olivier Bertrand
4a62480799 - Add the use of prepared statement in the JDBC table type. 
modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jdbconn.h
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
 2016-04-26 11:22:30 +02:00
Monty
f6cc7f1bdc Fixed failing test cases and compiler warnings 
- Fixed wait condition in kill_processlist-6619
- Updated Ssl_chiper for openssl tests
- Added supression for valgrinds when using libcrypto
- Fixed wrong argument to pthread_mutex in server_audit.c when compiling with debug
- Adding missing debug_sync_update() to debug_sync.h
- Added initializers to some variables and fixed error handling in jsonudf.cpp
- Fixed cluster_filter_unpack_varchar which doesn't have a stable index type.
- Updated compiler_warnings.supp
 2016-04-25 15:37:24 +03:00
Olivier Bertrand
26adbb2dd5 - Fix an error causing MYSQL table to fail saying "no result set" 
when joining a table to a MYSQL indexed table.
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/myconn.h
  modified:   storage/connect/tabmysql.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

- Fix and error causing remote indexing to fail when for not unique index.
  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
 2016-04-25 00:13:06 +02:00
Olivier Bertrand
c086a96b94 - Fix an error causing MYSQL table to fail saying "no result set" 
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
 2016-04-24 19:56:32 +02:00
Sergei Golubchik
ce38adddfa MDEV-9617 solaris sparc build fails on 10.0 
Spider:
  SunPro only supports array declarations with
  constant size. Spider already has a workaround for
  that, inside #ifdef _MSC_VER. Enable this code
  also for __SUNPRO_CC

Connect:
  Don't use anonymous union.
  Cast for mmap.
  Don't pass gcc-ish -W... options to SunPro
 2016-04-24 18:15:20 +02:00
Olivier Bertrand
afecdd2419 - Fix and error causing remote indexing to fail when for not unique index. 
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
 2016-04-23 23:20:10 +02:00
Sergey Vojtovich
282497dd6d MDEV-6720 - enable connection log in mysqltest by default 2016-03-31 10:11:16 +04:00
Olivier Bertrand
a1b2a28e55 - Fix MDEV-9779. Avoid buffer overflow when setting partname. 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/ha_connect.h
 2016-03-25 13:02:34 +01:00
Olivier Bertrand
8c9fd074d2 - Fix MDEV-9779. Avoid buffer overflow when setting partname. 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/ha_connect.h
 2016-03-25 12:46:42 +01:00
Olivier Bertrand
2c4715b3e2 Bigger partname to avoid MDEV-9779 2016-03-25 11:11:25 +01:00
Olivier Bertrand
e80c4b3186 - Fix MDEV-9779. Connection was not recognized in the option list. 
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
 2016-03-24 23:36:39 +01:00
Olivier Bertrand
d681c50a70 - Fix MDEV-9779. Connection was not recognized in the option list. 
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
 2016-03-24 23:24:33 +01:00
Sergei Golubchik
f67a2211ec Merge branch '10.1' into 10.2 2016-03-23 22:36:46 +01:00
Sergei Golubchik
d5a80519c9 Merge branch 'connect/10.1' into 10.1 2016-03-21 21:43:28 +01:00
Sergei Golubchik
3b0c7ac1f9 Merge branch '10.0' into 10.1 2016-03-21 13:02:53 +01:00
Sergei Golubchik
a2de604309 ASAN error in CONNECT engine 
don't strcpy a string to itself
 2016-03-21 11:43:19 +01:00
Sergei Golubchik
a1782b4ab9 MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Diagnostics_area::message() ; connect.xml* tests fail in buildbot 2016-03-19 19:40:25 +01:00
Olivier Bertrand
c1efc4a4dd - Fix compile error when copying a string on itself. 
modified:   storage/connect/value.cpp

- Fix compile error of MDEV-9603
  modified:   storage/connect/tabmysql.cpp
 2016-03-19 12:13:36 +01:00
Olivier Bertrand
59c4675c6b - Fix compile error when copying a string on itself. 
modified:   storage/connect/value.cpp

- Fix compile error of MDEV-9603
  modified:   storage/connect/tabmysql.cpp
 2016-03-19 12:02:03 +01:00
Sergei Golubchik
3fdc6140a3 update plugins' maturity levels 2016-03-18 22:05:23 +01:00
Olivier Bertrand
b80b292117 - Fix crash when sorting a TBL table with thread=yes. 
This was because Tablist can be NULL when no lacal tables are in the list.
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test
 2016-03-17 00:08:00 +01:00
Olivier Bertrand
66890975eb - Fix crash when sorting a TBL table with thread=yes. 
This was because Tablist can be NULL when no lacal tables are in the list.
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test
 2016-03-16 23:56:43 +01:00
Olivier Bertrand
fb9e2fa33f - Fix MDEV-9603 compiler error. 
modified:   storage/connect/tabmysql.cpp

- Test invalid CSV separator when creating the table (MDEV-9714)
  modified:   storage/connect/ha_connect.cc

- Stop using SQLDescribeParam anymore
  modified:   storage/connect/odbconn.cpp

- Fix MDEV-9723 Regression due to calling Cardinality instead of
  GetMaxSize in info.
  modified:   storage/connect/tabtbl.h
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test

- Typo
  modified:   storage/connect/tabodbc.cpp
 2016-03-16 19:17:55 +01:00
Olivier Bertrand
7829cefa41 - Fix MDEV-9603 compiler error. 
modified:   storage/connect/tabmysql.cpp

- Test invalid CSV separator when creating the table (MDEV-9714)
  modified:   storage/connect/ha_connect.cc

- Stop using SQLDescribeParam anymore
  modified:   storage/connect/odbconn.cpp

- Fix MDEV-9723 Regression due to calling Cardinality instead of
  GetMaxSize in info.
  modified:   storage/connect/tabtbl.h
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test

- Typo
  modified:   storage/connect/tabodbc.cpp
 2016-03-16 18:53:56 +01:00
Otto Kekäläinen
1777fd5f55 Fix spelling: occurred, execute, which etc 2016-03-04 02:09:37 +02:00
Sergei Golubchik
00d1db7a38 Merge branch '10.1' into 10.2 2016-02-25 18:19:55 +01:00
Sergei Golubchik
88576b3a80 Merge tracking branch 'connect/10.1' into 10.1 2016-02-23 22:16:35 +01:00
Sergei Golubchik
a5679af1b1 Merge branch '10.0' into 10.1 2016-02-23 21:35:05 +01:00
Olivier Bertrand
02fa3b8eea - Fix to MDEV-9579 be testing for void result. 
modified:   storage/connect/tabodbc.cpp
 2016-02-20 01:02:48 +01:00
Olivier Bertrand
69042ffe4e - Fix to MDEV-9579 be testing for void result. 
modified:   storage/connect/tabodbc.cpp
 2016-02-20 00:22:16 +01:00
Sergei Golubchik
5f2f3c4fa8 connect engine compiler warnings 2016-02-18 09:22:41 +01:00
Sergei Golubchik
77b548484e Merge branch 'connect/10.0' into 10.0 2016-02-16 19:35:58 +01:00
Olivier Bertrand
481e6433f4 - Fix to MDEV-9542 Connect was not handling NULLs in the answer 
from catalog functions and tables. It does now and when decimal
  is NULL defines DOUBLE without parameters.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/odbc.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/odbc_postgresql.result
  modified:   storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_xls.result
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/table.cpp
  modified:   storage/connect/valblk.h
 2016-02-15 23:41:59 +01:00
Olivier Bertrand
d163ad338d - Fix to MDEV-9542 Connect was not handling NULLs in the answer 
from catalog functions and tables. It does now and when decimal
  is NULL defines DOUBLE without parameters.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/odbc.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/odbc_postgresql.result
  modified:   storage/connect/mysql-test/connect/r/odbc_sqlite3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_xls.result
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/table.cpp
  modified:   storage/connect/valblk.h
 2016-02-15 10:32:30 +01:00
Monty
b2f8d7b410 Merge branch '10.1' into 10.2 
Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy
 2016-02-06 18:14:54 +02:00
Sergei Golubchik
71b39066d4 after merge fixes 
fix compiler warnings
 2016-01-25 22:59:52 +01:00
Sergei Golubchik
44dea7ffbf Merge branch 'connect/10.1' into 10.1 2016-01-25 22:59:41 +01:00
Sergei Golubchik
f4faac4d6a Merge branch '10.0' into 10.1 2016-01-25 22:58:57 +01:00
Olivier Bertrand
62a5e56c01 - Change SQL_NTS to 0 when the string is NULL 
modified:   storage/connect/odbconn.cpp

- Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed)
  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/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc
 2016-01-25 18:44:51 +01:00
Olivier Bertrand
8fb34ea8c1 - Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed) 
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/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc
 2016-01-25 14:10:09 +01:00
Olivier Bertrand
ddd62ba24a - Change SQL_NTS to 0 when the string is NULL 
modified:   storage/connect/odbconn.cpp
 2016-01-18 23:00:40 +01:00
Olivier Bertrand
0891ae2fbb - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema 
(was sometimes in XTAB Catalog)
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
 2016-01-09 20:52:17 +01:00
Olivier Bertrand
3e20a0d8f4 - Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema 
(was sometimes in XTAB Catalog)
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp
 2016-01-09 19:51:51 +01:00
Monty
4b4777ab63 Backported fix for ccache 
Fixed compiler warnings
Added --big-test to tokudb change_column_char & change_column_bin
 2016-01-03 12:48:55 +02:00