mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
177428 commits 2778 branches 343 tags 1.6 GiB
Commit graph

18619 commits

Author SHA1 Message Date
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
Olivier Bertrand
60fa113f51 Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp 2017-08-12 18:32:32 +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
Olivier Bertrand
017d9ccf5d Fix Linux compile error by #define NODW. Modified: plgdbutl.cpp 2017-08-08 11:32:35 +02:00
Olivier Bertrand
cdf00b8d92 - Fix bug returning pointer to a stack string 
in JVALUE::GetString
  modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp

- Fix a compiler bug happening on some configuration and platforms
  in JSNX::CalculateArray
  modified:   storage/connect/jsonudf.cpp

- Set default Schema as current directory
  This fix several bugs like:
    Fail to make JSON catalog tables
    Fail to use zipped file made by a file LOAD
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
 2017-08-07 16:24:53 +02:00
Olivier Bertrand
f5b0993bbd Fix Linux compile error by #define NODW. Modified: plgdbutl.cpp; typo Modified: odbconn.h 2017-08-06 22:01:18 +02:00
Olivier Bertrand
0387c13ee7 - Add a define making ha_connect.cc source unique for all MariaDB version. 
#if defined(NEW_MAR)
#define stored_in_db stored_in_db()
#endif   // NEW_MAR)
  modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/ha_connect.cc

- Fix compile failure for some configuration of CONNECT.
This by updating the #ifdef's JDBC, MONGO and CMGO_SUPPORT.
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

- Fix failure of zip.test (restore code wrongly deleted)
  modified:   storage/connect/tabjson.cpp

- Make sure thread TBL table structure is correctly initialized.
  modified:   storage/connect/tabtbl.cpp

- Add new test case in tbl_thread.test
  modified:   storage/connect/mysql-test/connect/r/tbl_thread.result
  modified:   storage/connect/mysql-test/connect/t/tbl_thread.test

- Remake a jar file after Java was updated
  modified:   storage/connect/mysql-test/connect/std_data/Mongo3.jar
 2017-08-06 19:56:57 +02:00
Olivier Bertrand
d8f99f165b - Add FBLOCK when opening ODBC, JSON and MONGO tables. 
This to have automatic closing in case of thrown error.
  modified:   storage/connect/cmgoconn.cpp
  modified:   storage/connect/cmgoconn.h
  modified:   storage/connect/filamzip.cpp
  modified:   storage/connect/javaconn.cpp
  modified:   storage/connect/javaconn.h
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/odbconn.h
  modified:   storage/connect/plgdbsem.h
  modified:   storage/connect/plgdbutl.cpp

- Fix INCOL bug when inserting several lines to MONGO tables
  modified:   storage/connect/cmgoconn.cpp
  modified:   storage/connect/tabcmg.cpp
  modified:   storage/connect/tabjmg.cpp

- MONGO_SUPPORT is set for both MongoDB drivers
  CMGO_SUPPORT  is set only when the C driver is available
  modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/filter.h
  modified:   storage/connect/filter.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mongo.cpp
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

- Separate enums JCATINFO and
  modified:   storage/connect/javaconn.h
  modified:   storage/connect/jdbconn.cpp

- Fix crash when executing JDBC catfunc=driver
  modified:   storage/connect/jdbconn.cpp

- Report an error when the Mongo driver if explicitly
specified and not supported.
  modified:   storage/connect/mongo.cpp

- Fix bug causing catalog JSON tables to fail
  modified:   storage/connect/tabjson.cpp

- Protect by mutex the Ready variable of the TBLTBM table type
  modified:   storage/connect/tabtbl.cpp

- Put testing of Thread TBL tables in a separate test
With added case and modified old case that could avoid the test to fail.
  modified:   storage/connect/mysql-test/connect/r/tbl.result
  modified:   storage/connect/mysql-test/connect/t/tbl.test
  new file:   storage/connect/mysql-test/connect/r/tbl_thread.result
  new file:   storage/connect/mysql-test/connect/t/tbl_thread.test

- jmongo3.test no more exists
  deleted:    storage/connect/mysql-test/connect/t/jmongo3.test

- Add new tests for the MONGO feature (disabled)
  modified:   storage/connect/mysql-test/connect/disabled.def
  new file:   storage/connect/mysql-test/connect/r/json_java_2.result
  new file:   storage/connect/mysql-test/connect/r/json_java_3.result
  new file:   storage/connect/mysql-test/connect/r/json_mongo_c.result
  new file:   storage/connect/mysql-test/connect/r/mongo_c.result
  new file:   storage/connect/mysql-test/connect/r/mongo_java_2.result
  new file:   storage/connect/mysql-test/connect/r/mongo_java_3.result
  new file:   storage/connect/mysql-test/connect/std_data/Mongo2.jar
  new file:   storage/connect/mysql-test/connect/std_data/cities.json
  new file:   storage/connect/mysql-test/connect/t/json_java_2.test
  new file:   storage/connect/mysql-test/connect/t/json_java_3.test
  new file:   storage/connect/mysql-test/connect/t/json_mongo_c.test
  new file:   storage/connect/mysql-test/connect/t/mongo.inc
  new file:   storage/connect/mysql-test/connect/t/mongo_c.test
  new file:   storage/connect/mysql-test/connect/t/mongo_java_2.test
  new file:   storage/connect/mysql-test/connect/t/mongo_java_3.test
  new file:   storage/connect/mysql-test/connect/t/mongo_test.inc
 2017-08-05 18:08:51 +02:00
Olivier Bertrand
df3fd420e5 wrapname hidden when no JDBC support, modified: storage/connect/tabjson.cpp 2017-07-28 21:13:19 +02:00
Olivier Bertrand
13b26f84bd -- Fix wrong setting of Pipe 
modified:   storage/connect/tabcmg.cpp

-- Fix declaration of drv in MGOColumns
  modified:   storage/connect/mongo.cpp

-- Add jmongo3 test (disabled)
  modified:   storage/connect/mysql-test/connect/disabled.def
  added:      storage/connect/mysql-test/connect/std_data/Mongo3.jar
  added:      storage/connect/mysql-test/connect/t/jmongo3.test
 2017-07-28 15:39:31 +02:00
Olivier Bertrand
c51b1a1f60 Update storage/connect/JavaWrappers.jar 2017-07-25 00:40:42 +02:00
Olivier Bertrand
f5cd810629 Update storage/connect/JavaWrappers.jar 2017-07-25 00:21:45 +02:00
Olivier Bertrand
376d1c433c Update storage/connect/JavaWrappers.jar 2017-07-24 00:05:07 +02:00
Olivier Bertrand
510e67c6fd Fix discovery crash for Java Mongo tables. Modified: storage/connect/tabjmg.cpp 2017-07-23 12:41:44 +02:00
Olivier Bertrand
7388f95319 -- Last wrappers version with support of Java Mongo discovery. 
modified:   storage/connect/JavaWrappers.jar

-- Typo
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/plgdbutl.cpp
 2017-07-23 11:58:20 +02:00
Olivier Bertrand
cfe3252afe -- No suppressing of the GetPlug function. It is GetUser that can cause memory leak 
when xp is modified. The old xp must be poped or is never freed.
  modified:   storage/connect/ha_connect.cc
 2017-07-22 17:23:26 +02:00
Olivier Bertrand
3329fbae19 -- Suppress the GetPlug function causing memory leak 
modified:   storage/connect/ha_connect.h
  modified:   storage/connect/ha_connect.cc

-- Trace work storage allocation and freeing in DEVELOPMENT mode
   (Fix a compile error)
  modified:   storage/connect/plugutil.cpp
 2017-07-22 00:21:59 +02:00
Olivier Bertrand
6fdd5cda6a Fix compile error. Modified user_connect.cc ha_connect.cc 2017-07-21 16:26:08 +02:00
Olivier Bertrand
8476d3052a -- Add mutex for user_connect handling 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/user_connect.cc
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/user_connect.cc

-- Trace work storage allocation and freeing in DEVELOPMENT mode
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/plugutil.cpp
 2017-07-21 15:24:13 +02:00
Olivier Bertrand
df091237a8 Modified /storage/connect/value.cpp line 668 2017-07-20 11:19:44 +02:00
Olivier Bertrand
e99af2a3fa -- Fix warnings from the new GCC 7 
modified:   storage/connect/ha_connect.cc

-- Set NULL false in SetJsonValue
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp
 2017-07-19 23:30:40 +02:00
Olivier Bertrand
ad2a4c42b6 Parenthesize set null in SetValue_pval. Modified /storage/connect/value.cpp 2017-07-19 18:31:40 +02:00
Olivier Bertrand
e05920f783 -- Check whether USERBLK still exists in PlugExit 
modified:   storage/connect/connect.cc
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/jsonudf.cpp

-- Update result from json_udf test
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
 2017-07-19 00:16:58 +02:00
Olivier Bertrand
38c9c0d22b Fix compile warnings and errors for nullptr. Modified /storage/connect/tabjmg (cpp and h) 2017-07-18 16:12:32 +02:00
Olivier Bertrand
f590296c28 -- Finalize work on MongoDB access 
Implement discovery for the MongoDB Java Driver
   Create classes to minimize code and avoid dupicates
   Rearrange and rename implied files
  modified:   storage/connect/CMakeLists.txt
  renamed:    storage/connect/mongofam.cpp -> storage/connect/cmgfam.cpp
  renamed:    storage/connect/mongofam.h -> storage/connect/cmgfam.h
  modified:   storage/connect/cmgoconn.h
  modified:   storage/connect/javaconn.h
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/jmgoconn.cpp
  modified:   storage/connect/jmgoconn.h
  modified:   storage/connect/mongo.cpp
  modified:   storage/connect/mongo.h
  renamed:    storage/connect/tabmgo.cpp -> storage/connect/tabcmg.cpp
  renamed:    storage/connect/tabmgo.h -> storage/connect/tabcmg.h
  modified:   storage/connect/tabjmg.cpp
  modified:   storage/connect/tabjmg.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

-- Trace Sarea allocation and freeing
  modified:   storage/connect/connect.cc
  modified:   storage/connect/plugutil.cpp
  modified:   storage/connect/user_connect.cc

-- Null Json values where not mark as null in JSNX::SetJsonValue
   This was added in TYPE_NULL (declared as TYPE_VOID)
  modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp

-- Null JValues are ignored in JSNX::CalculateArray
   Also done in tabjson.cpp for JSONCOL::CalculateArray
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp

-- Null JSON values now represented by connect_json_null session variable
  modified:   storage/connect/json.cpp
  modified:   storage/connect/json.h
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/tabjson.cpp

-- JVALUE has size = 1
  modified:   storage/connect/json.h

-- Fix by vuvova because Debian compilation failure.
  modified:   storage/connect/value.cpp
 2017-07-18 13:16:55 +02:00
Olivier Bertrand
a9d32010d0 - Fix MDEV-13239 Suppress the restriction about no blanks 
around , and = in the OPTION_LIST.
  modified:   storage/connect/ha_connect.cc
 2017-07-04 19:18:14 +02:00
Olivier Bertrand
b63f847743 - Suppress warning when creating mongo JSON tables 
modified:   storage/connect/ha_connect.cc

- Add catalog table for Mongo java driver tables
  modified:   storage/connect/mongo.cpp
  modified:   storage/connect/mongo.h
  modified:   storage/connect/tabjmg.cpp
  modified:   storage/connect/tabjmg.h
 2017-07-03 22:28:55 +02:00
Olivier Bertrand
94e5d7de85 - Add Support of the MongoDB Java Driver. 
modified:   storage/connect/CMakeLists.txt
  modified:   storage/connect/JavaWrappers.jar
  modified:   storage/connect/colblk.h
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/filter.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/mongofam.cpp
  modified:   storage/connect/mongofam.h
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/tabext.h
  modified:   storage/connect/tabjdbc.cpp
  modified:   storage/connect/tabjdbc.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
  modified:   storage/connect/tabmgo.cpp
  modified:   storage/connect/tabmgo.h
  created:    storage/connect/Mongo2Interface.java
  created:    storage/connect/Mongo3Interface.java
  created:    storage/connect/cmgoconn.cpp
  created:    storage/connect/cmgoconn.h
  created:    storage/connect/javaconn.cpp
  created:    storage/connect/javaconn.h
  created:    storage/connect/jmgfam.cpp
  created:    storage/connect/jmgfam.h
  created:    storage/connect/jmgoconn.cpp
  created:    storage/connect/jmgoconn.h
  created:    storage/connect/mongo.cpp
  created:    storage/connect/mongo.h
  created:    storage/connect/tabjmg.cpp
  created:    storage/connect/tabjmg.h

- tdbp not initialized when catched exception
in CntGetTDB (connect.cc line 188)
  modified:   storage/connect/connect.h

- CheckCleanup should sometimes doing cleanup on pure info
Sometimes MariaDB loops on info to get the size of all tables in a database.
This can sometimes fail by exhausted memory.
CheckCleanup now have a force boolean parameter (defaulting to false)
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/user_connect.cc
  modified:   storage/connect/user_connect.h

Change the copyright of some source files
  modified:   storage/connect/connect.cc
  modified:   storage/connect/connect.h
  modified:   storage/connect/engmsg.h
  modified:   storage/connect/global.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/ha_connect.h
  modified:   storage/connect/msgid.h
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/os.h
  modified:   storage/connect/osutil.c
  modified:   storage/connect/osutil.h
  modified:   storage/connect/user_connect.cc
  modified:   storage/connect/user_connect.h
 2017-07-02 22:41:11 +02:00
Olivier Bertrand
c51548d6b4 Fix unhandled exception: 
Force type int for ENUMs.
Replace remaining longjmp.
  modified:   storage/connect/array.cpp
  modified:   storage/connect/colblk.cpp
  modified:   storage/connect/connect.cc
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabvir.cpp
  modified:   storage/connect/tabxml.cpp
  modified:   storage/connect/value.cpp
  modified:   storage/connect/xobject.cpp
 2017-06-11 17:22:56 +02:00
Olivier Bertrand
f3452fcd84 Add MONGO catalog table 
modified:   storage/connect/tabmgo.cpp
  modified:   storage/connect/tabmgo.h
 2017-06-10 00:52:56 +02:00
Olivier Bertrand
da3c3b903f Fix MDEV-12973: Blank columns querying SQL Server 
Added support of NCHAR, NVARCHAR an ROWID JDBC types.
  modified:   storage/connect/jdbconn.cpp
 2017-06-08 18:01:47 +02:00
Olivier Bertrand
5b534a6889 Fix MDEV-12969. Crash during inserting binary value in Connect table. 
Seems due to making an index on unsigned integer that triggers an
un-handled THROW.
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/xindex.cpp
 2017-06-06 17:28:26 +02:00
Olivier Bertrand
c746b768ad Tabname defaults to the table name for MONGO tables 
modified:   storage/connect/ha_connect.cc
 2017-06-03 23:33:51 +02:00
Olivier Bertrand
aef1493224 Protect Info function against NULL g pointer 
modified:   storage/connect/ha_connect.cc

Update failing test
  modified:   storage/connect/mysql-test/connect/t/secure_file_priv.test
 2017-06-01 10:14:03 +02:00
Olivier Bertrand
de1a9b172a Add table option FILTER used by Mongo and Json tables. 
modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mongofam.cpp
  modified:   storage/connect/mycat.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
  modified:   storage/connect/tabmgo.cpp
  modified:   storage/connect/tabmgo.h

Fix a regression bug in MongoFam
(all = true only when no Options)
  modified:   storage/connect/mongofam.cpp

Fix a regression bug in JsonCol
(in JSONCOL::GetJpath)
  modified:   storage/connect/tabjson.cpp
 2017-05-29 19:46:59 +02:00
Olivier Bertrand
cbdfdfc829 Add CHECK TABLE to the list of accepted commands. 
This is to avoid an error to be reported when executing this command on a CONNECT table.
  modified:   storage/connect/ha_connect.cc
 2017-05-28 12:43:54 +02:00
Olivier Bertrand
f5dfd9f6cd Use english error msg in xml.result 2017-05-26 14:36:15 +02:00
Olivier Bertrand
b72c4e50d6 Missing quote in infoschema2-9739.result 2017-05-26 14:29:04 +02:00
Olivier Bertrand
bffa06c7fa Try to fix failing tests on LINUX 
modified:   storage/connect/mysql-test/connect/r/alter_xml2.result
  modified:   storage/connect/mysql-test/connect/r/infoschema2-9739.result
  modified:   storage/connect/mysql-test/connect/r/xml2_grant.result
  modified:   storage/connect/mysql-test/connect/r/xml2_mdev5261.result
  modified:   storage/connect/mysql-test/connect/r/xml_mdev5261.result
  modified:   storage/connect/mysql-test/connect/t/xml2_mdev5261.test
  modified:   storage/connect/mysql-test/connect/t/xml_mdev5261.test
 2017-05-26 11:31:36 +02:00
Olivier Bertrand
e58620cd63 Try to fix failing tests 
modified:   storage/connect/mysql-test/connect/r/alter_xml2.result
  modified:   storage/connect/mysql-test/connect/r/infoschema2-9739.result
  modified:   storage/connect/mysql-test/connect/r/xml2_mdev5261.result
 2017-05-25 23:51:57 +02:00
Olivier Bertrand
7f02ab70b3 Recognize xmlsup option case insensitive 
modified:   storage/connect/ha_connect.cc

Update tests to reflect recent changes, in particular new Jpath syntax
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/mysql-test/connect/r/alter_xml.result
  modified:   storage/connect/mysql-test/connect/r/bin.result
  modified:   storage/connect/mysql-test/connect/r/dir.result
  modified:   storage/connect/mysql-test/connect/r/grant.result
  modified:   storage/connect/mysql-test/connect/r/grant2.result
  modified:   storage/connect/mysql-test/connect/r/infoschema-9739.result
  modified:   storage/connect/mysql-test/connect/r/ini_grant.result
  modified:   storage/connect/mysql-test/connect/r/jdbc_new.result
  modified:   storage/connect/mysql-test/connect/r/mysql_discovery.result
  modified:   storage/connect/mysql-test/connect/r/mysql_exec.result
  modified:   storage/connect/mysql-test/connect/r/mysql_grant.result
  modified:   storage/connect/mysql-test/connect/r/mysql_new.result
  modified:   storage/connect/mysql-test/connect/r/unsigned.result
  modified:   storage/connect/mysql-test/connect/r/upd.result
  modified:   storage/connect/mysql-test/connect/r/xml.result
  modified:   storage/connect/mysql-test/connect/r/xml_grant.result
  modified:   storage/connect/mysql-test/connect/r/xml_html.result
  modified:   storage/connect/mysql-test/connect/r/xml_mdev5261.result
  modified:   storage/connect/mysql-test/connect/r/xml_mult.result
  modified:   storage/connect/mysql-test/connect/r/xml_zip.result
  modified:   storage/connect/mysql-test/connect/t/alter_xml.test
  modified:   storage/connect/mysql-test/connect/t/dir.test
  modified:   storage/connect/mysql-test/connect/t/infoschema-9739.test
  modified:   storage/connect/mysql-test/connect/t/jdbc_new.test
  modified:   storage/connect/mysql-test/connect/t/mysql_exec.test
  modified:   storage/connect/mysql-test/connect/t/mysql_new.test
  modified:   storage/connect/mysql-test/connect/t/unsigned.test
  modified:   storage/connect/mysql-test/connect/t/upd.test
  modified:   storage/connect/mysql-test/connect/t/xml.test
  modified:   storage/connect/mysql-test/connect/t/xml_grant.test
  modified:   storage/connect/mysql-test/connect/t/xml_html.test
  modified:   storage/connect/mysql-test/connect/t/xml_mdev5261.test
  modified:   storage/connect/mysql-test/connect/t/xml_mult.test
  modified:   storage/connect/mysql-test/connect/t/xml_zip.test
 2017-05-25 21:43:11 +02:00
Olivier Bertrand
46cf1a0db3 Fix bug: Discovery of JSON table fails in DEBUG mode 
when NO MONGO support. (tdb->Uri is uninitialized)
  modified:   storage/connect/tabjson.cpp
 2017-05-23 23:02:48 +02:00
Olivier Bertrand
3e36eb230b Fix gcc compiler warnings reported by Sergei 
modified:   storage/connect/array.cpp
  modified:   storage/connect/array.h
  modified:   storage/connect/blkfil.cpp
  modified:   storage/connect/blkfil.h
  modified:   storage/connect/block.h
  modified:   storage/connect/colblk.cpp
  modified:   storage/connect/colblk.h
  modified:   storage/connect/csort.h
  modified:   storage/connect/filamvct.cpp
  modified:   storage/connect/filter.cpp
  modified:   storage/connect/filter.h
  modified:   storage/connect/global.h
  modified:   storage/connect/json.h
  modified:   storage/connect/plgdbsem.h
  modified:   storage/connect/plgdbutl.cpp
  modified:   storage/connect/tabcol.cpp
  modified:   storage/connect/tabcol.h
  modified:   storage/connect/tabdos.cpp
  modified:   storage/connect/tabdos.h
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/table.cpp
  modified:   storage/connect/tabodbc.cpp
  modified:   storage/connect/tabodbc.h
  modified:   storage/connect/tabsys.h
  modified:   storage/connect/tabxml.h
  modified:   storage/connect/value.cpp
  modified:   storage/connect/value.h
  modified:   storage/connect/xindex.cpp
  modified:   storage/connect/xindex.h
  modified:   storage/connect/xobject.cpp
  modified:   storage/connect/xobject.h
  modified:   storage/connect/xtable.h

Set values as nullable when retrieving catalog info
  modified:   storage/connect/jdbconn.cpp
  modified:   storage/connect/mysql-test/connect/r/odbc_oracle.result
  modified:   storage/connect/odbconn.cpp

Change format of Jpath
  modified:   storage/connect/json.cpp
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/r/json.result
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/r/json_udf_bin.result
  modified:   storage/connect/mysql-test/connect/r/zip.result
  modified:   storage/connect/mysql-test/connect/t/json.test
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf_bin.test
  modified:   storage/connect/mysql-test/connect/t/zip.test
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h
  modified:   storage/connect/tabmgo.cpp

Change null representation from ??? to <null>
  modified:   storage/connect/json.cpp

Change the name of UDF that are equal to a native JSON function name
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc

Fix bug in making JSON project info
  modified:   storage/connect/mongofam.cpp

Fix COMPUTE when one argument is null
  modified:   storage/connect/value.cpp

Value is null only when nullable
  modified:   storage/connect/value.h
 2017-05-23 19:35:50 +02:00
Sergei Petrunia
fff61e31ec Fix a compiler warning 2017-05-17 14:44:16 +03:00
Monty
f7dab76aa2 MDEV-12756 rpl.rpl_killed_ddl fails in buildbot with 'Can't find record' 
The issue was that my_errno was not set properly when a repair was killed,
which confused the rpl_killed_ddl script.

I also added an extra test line in varchar.inc to ensure we don't give
duplicate error rows.
 2017-05-17 00:00:27 +03:00
Marko Mäkelä
f9069a3dc0 MDEV-12674 Post-merge fix: Include accidentally omitted changes 
In 10.2, the definition of simple_counter resides in the file
sync0types.h, not in the file os0sync.h which has been removed.
 2017-05-12 15:44:17 +03:00