mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
184363 commits 2788 branches 343 tags 1.7 GiB
Commit graph

1418 commits

Author SHA1 Message Date
Vladislav Vaintroub
daabb4d055 Fix truncation warnings in connect 2017-10-11 08:36:04 +02:00
Sergei Golubchik
ebda6e958f enable MongoDB support in CONNECT 2017-10-04 18:36:30 +02:00
Vladislav Vaintroub
7354dc6773 MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
Vladislav Vaintroub
eba44874ca MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. 
- Fix win64 pointer truncation warnings
(usually coming from misusing 0x%lx and long cast in DBUG)

- Also fix printf-format warnings

Make the above mentioned warnings fatal.

- fix pthread_join on Windows to set return value.
 2017-09-28 17:20:46 +00:00
Sergei Golubchik
ca3c8d9b58 shut out Connect cmake-time warning about missing Findlibmondgodoc.cmake 2017-09-22 14:01:27 +02:00
Sergei Golubchik
f1ce69f3a9 Merge branch '10.1' into 10.2 
But without f4f48e06215..f8a800bec81 - fixes for MDEV-12672
and related issues. 10.2 specific fix follows...
 2017-09-22 02:27:00 +02:00
Sergei Golubchik
2e3a16e366 Merge branch '10.0' into 10.1 2017-09-21 22:02:21 +02:00
Sergei Golubchik
cb1b466c0c CONNECT: compilation fix 
tabtyp was defined under ODBC_SUPPORT, but used
outside of it too (under JDBC_SUPPORT).
 2017-09-21 21:43:07 +02:00
Sergei Golubchik
8f3fd98d25 connect fixes after-merge 
disable Mongo in 10.0, compiler warnings.
 2017-09-20 17:07:05 +02:00
Vicențiu Ciorbaru
5b9c32ede0 Merge remote-tracking branch 'connect/10.2' into 10.2 2017-09-19 15:13:53 +03:00
Vicențiu Ciorbaru
ec6042bda0 Merge branch '10.0' into 10.1 2017-09-19 12:06:50 +03:00
Vicențiu Ciorbaru
0e15396341 Fix fall-through warning 2017-09-19 11:17:35 +03:00
Vicențiu Ciorbaru
b2c0cca6b0 Fix connect merge problems 
* CMakeLists.txt erroneous duplicated lines.
* Unneded differences in tabjson.cpp
* Unneded space differences in jdbconn.{cpp|h}
 2017-09-19 09:37:17 +03:00
Vicențiu Ciorbaru
df2675a9cc Merge connect/10.0 into 10.0 
This is a squashed merge.
 2017-09-19 02:05:11 +03:00
Olivier Bertrand
791e5fd488 Enable MONGO for the C driver. Modified: modified: storage/connect/CMakeLists.txt 2017-09-11 16:30:45 +02:00
Olivier Bertrand
bf34e9db7b Enable MONGO for the C driver. Modified: modified: storage/connect/CMakeLists.txt 2017-09-11 16:23:06 +02:00
Olivier Bertrand
0f4b540780 - Update version number 
modified:   storage/connect/ha_connect.cc

- Regard columns with binary charset as string (was binary)
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabutil.cpp

- Support length 0 for CHAR and VARCHAR
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/value.cpp

- Add ACCEPT option for void columns in discovery
  modified:   storage/connect/tabjson.cpp

- Update some tests because of above change
  modified:   storage/connect/mysql-test/connect/r/json_java_2.result
  modified:   storage/connect/mysql-test/connect/r/json_java_3.result
  modified:   storage/connect/mysql-test/connect/r/json_mongo_c.result
  modified:   storage/connect/mysql-test/connect/r/mongo_c.result
  modified:   storage/connect/mysql-test/connect/r/mongo_java_2.result
  modified:   storage/connect/mysql-test/connect/r/mongo_java_3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/updelx.result
  modified:   storage/connect/mysql-test/connect/t/mongo_test.inc
 2017-09-05 15:58:46 +02:00
Olivier Bertrand
7e65bdba7b - Update version number 
modified:   storage/connect/ha_connect.cc

- Regard columns with binary charset as string (was binary)
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabutil.cpp

- Support length 0 for CHAR and VARCHAR
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/value.cpp

- Add ACCEPT option for void columns in discovery
  modified:   storage/connect/tabjson.cpp

- Update some tests because of above change
  modified:   storage/connect/mysql-test/connect/r/json_java_2.result
  modified:   storage/connect/mysql-test/connect/r/json_java_3.result
  modified:   storage/connect/mysql-test/connect/r/json_mongo_c.result
  modified:   storage/connect/mysql-test/connect/r/mongo_c.result
  modified:   storage/connect/mysql-test/connect/r/mongo_java_2.result
  modified:   storage/connect/mysql-test/connect/r/mongo_java_3.result
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/mysql-test/connect/r/updelx.result
  modified:   storage/connect/mysql-test/connect/t/mongo_test.inc
 2017-09-04 22:32:02 +02:00
Olivier Bertrand
c23b832556 - Fix MongoDB C Driver adding for CMAKE. 
Requires MongoDB C Driver version 1.7 now available
  modified:   storage/connect/CMakeLists.txt

- Add more trace to tbl_thread.test (to debug failure)
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
 2017-09-02 16:07:46 +02:00
Olivier Bertrand
703ce16a11 - Add more trace to tbl_thread.test (to debug failure) 
modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
 2017-09-02 16:01:31 +02:00
Olivier Bertrand
7ccce51b09 Disable MONGO modified: storage/connect/CMakeLists.txt 2017-09-02 14:57:49 +02:00
Olivier Bertrand
01d86c74af - Fix MongoDB C Driver adding for CMAKE. 
Requires MongoDB C Driver version 1.7 now available
  modified:   storage/connect/CMakeLists.txt
 2017-09-02 10:59:39 +02:00
Olivier Bertrand
f6103105c0 Merging from MariaDB repository 2017-08-31 01:26:45 +02:00
Olivier Bertrand
36b2dec114 - Set MONGO_ENABLED 
modified:   storage/connect/CMakeLists.txt

- Avoid gcc warnings for "fall through"
  modified:   storage/connect/array.cpp
  modified:   storage/connect/filamdbf.cpp
  modified:   storage/connect/filamfix.cpp
  modified:   storage/connect/filamtxt.cpp
  modified:   storage/connect/filamvct.cpp
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/xobject.cpp
 2017-08-31 01:22:50 +02:00
Olivier Bertrand
5c42d86aff - New distribution enabling or disabling the MONGO table type 
modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mycat.cc

- Extend SRCDEF parameter processing to MYSQL
  modified:   storage/connect/tabext.cpp
  modified:   storage/connect/tabext.h
  modified:   storage/connect/tabmysql.cpp

- Typo
  modified:   storage/connect/mysql-test/connect/std_data/Mongo2.jar
  modified:   storage/connect/mysql-test/connect/std_data/Mongo3.jar
 2017-08-29 18:20:01 +02:00
Olivier Bertrand
96252b6abd - New distribution enabling or disabling the MONGO table type 
modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mycat.cc

- Extend SRCDEF parameter processing to MYSQL
  modified:   storage/connect/tabext.cpp
  modified:   storage/connect/tabext.h
  modified:   storage/connect/tabmysql.cpp

- Typo
  modified:   storage/connect/mysql-test/connect/std_data/Mongo2.jar
  modified:   storage/connect/mysql-test/connect/std_data/Mongo3.jar
 2017-08-29 17:35:27 +02:00
Marko Mäkelä
f192b48d62 Merge 10.1 into 10.2 2017-08-29 10:07:33 +03:00
Marko Mäkelä
11352d52cd Merge 10.0 into 10.1 2017-08-28 15:05:46 +03:00
Olivier Bertrand
5b998bf953 - Fix MDEV-13621 JDBC UPDATE containing single or double quote chars produces wrong result 
in ha_connect::GetStringOption
  modified:   storage/connect/ha_connect.cc

- Begin implement data type BINARY
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/myutil.cpp
  modified:   storage/connect/valblk.cpp
  modified:   storage/connect/valblk.h
  modified:   storage/connect/value.cpp

- Fix MDEV-12422 CONNECT Engine to support CHECK TABLE
  Adding a fake check function returning HA_ADMIN_OK.
  modified:   storage/connect/ha_connect.h

- Treat TBL (thread) as local when connected to the current server
  and return by timeout when a TBL remote table connection fail (Thread only)
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/tabmysql.h
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabtbl.h

- Update some tests and result files
  Add test output to tbl_thread.test tryng to understand failure
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
  modified:   storage/connect/mysql-test/connect/r/updelx.result

- Add the GetCsName function
  modified:   storage/connect/reldef.h
 2017-08-27 17:23:27 +02:00
Olivier Bertrand
438211a175 - Fix MDEV-13621 Replace sprintf by strcpy for opval 
modified:   storage/connect/ha_connect.cc

- Add test output to tbl_thread.test tryng to understand failure
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
  modified:   storage/connect/tabtbl.cpp
 2017-08-26 16:18:43 +02:00
Olivier Bertrand
614611d7c0 - Fix MDEV-13621 JDBC UPDATE containing single or double quote chars produces wrong result 
in ha_connect::GetStringOption
  modified:   storage/connect/ha_connect.cc

- Begin implement data type BINARY
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/myutil.cpp
  modified:   storage/connect/valblk.cpp
  modified:   storage/connect/valblk.h
  modified:   storage/connect/value.cpp

- Fix MDEV-12422 CONNECT Engine to support CHECK TABLE
  Adding a fake check function returning HA_ADMIN_OK.
  modified:   storage/connect/ha_connect.h

- Treat TBL (thread) as local when connected to the current server
  and return by timeout when a TBL remote table connection fail (Thread only)
  modified:   storage/connect/myconn.cpp
  modified:   storage/connect/tabmysql.h
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabtbl.h

- Update some tests and result files
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
  modified:   storage/connect/mysql-test/connect/r/updelx.result

- Add the GetCsName function
  modified:   storage/connect/reldef.h
 2017-08-26 11:02:53 +02:00
Vladislav Vaintroub
7aa846e9e3 CONNECT engine: install ha_connect.lib 2017-08-23 23:30:51 +00:00
Vladislav Vaintroub
7b36395ee9 MDEV-13630 : dont install connect-specific JAR files if connect is not built. 2017-08-23 23:29:59 +00:00
Olivier Bertrand
5f83a9b751 - Fix MDEV-12422 by implementing a fake virtual "check" function. 
modified:   storage/connect/ha_connect.h
 2017-08-20 13:13:52 +02:00
Olivier Bertrand
b6afeacd33 - Fix failing test tbl_thread on linux 
(and mask another fail until MDEV-10179 is fixed)
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
 2017-08-18 12:45:31 +02:00
Olivier Bertrand
2db52e1704 - Fix failing test tbl_thread on linux 
(and mask another fail until MDEV-10179 is fixed)
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
 2017-08-17 16:13:01 +02:00
Sergei Golubchik
cb1e76e4de Merge branch '10.1' into 10.2 2017-08-17 11:38:34 +02:00
Sergei Golubchik
1b7e55900a CONNECT: compilation fix 
tabtyp was defined under ODBC_SUPPORT, but used
outside of it too (under JDBC_SUPPORT).
 2017-08-16 18:17:07 +02:00
Sergei Golubchik
158f96f6e3 CONNECT: fix the test to use tcp not unix socket 
(socket connection ignores the port and CONNECT connects to the wrong host)
 2017-08-16 18:17:03 +02:00
Sergei Golubchik
678fb208e4 Merge branch 'connect/10.2' into 10.2 2017-08-16 18:16:50 +02:00
Olivier Bertrand
4d5844d9da Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp 2017-08-13 16:11:09 +02:00
Olivier Bertrand
60fa113f51 Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp 2017-08-12 18:32:32 +02:00
Olivier Bertrand
11ce35ea63 Restore tabs. Modified: storage/connect/mysql-test/connect/r/xml2_grant.result and storage/connect/mysql-test/connect/r/xml2_mdev5261.result 2017-08-11 19:06:33 +02:00
Olivier Bertrand
3979f130db Fix failing tests. Modified: storage/connect/mysql-test/connect/r/xml2_grant.result and storage/connect/mysql-test/connect/r/xml2_mdev5261.result 2017-08-11 16:44:44 +02:00
Olivier Bertrand
0b9ea65dc1 Make source from 10.2 source 2017-08-10 16:16:25 +02:00
Olivier Bertrand
efc8a5b689 - Fix gcc compile error: crosses initialization of ‘const char* drv’ 
modified:   storage/connect/mongo.cpp

- Fix test failures
  modified:   storage/connect/mysql-test/connect/r/mysql.result
  modified:   storage/connect/mysql-test/connect/r/mysql_new.result
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test
  modified:   storage/connect/tabjson.cpp
 2017-08-09 12:50:06 +02:00
Olivier Bertrand
3523c12eb0 - Re-Re-trying to fix Linux compile on DWORD. 
modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/os.h
  modified:   storage/connect/plgdbutl.cpp
 2017-08-09 01:37:06 +02:00
Olivier Bertrand
272b397748 - Re-trying to fix Linux compile on DWORD. 
modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/plgdbutl.cpp
 2017-08-09 01:23:48 +02:00
Olivier Bertrand
7947121e9a Trying to fix Linux compile on DWORDW. Modified: storage/connect/os.h 2017-08-08 22:36:22 +02:00
Olivier Bertrand
4d4ba60c6e - Fix MDEV-13463 unescape table name during detection of table structure 
modified:   storage/connect/myconn.cpp

- Remove a few gcc warnings
  modified:   storage/connect/jmgoconn.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/tabjson.cpp
 2017-08-08 17:36:54 +02:00