xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE #352
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…_SPACE not space like 9a218f4 fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not space Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
cvicentiu
added a commit
that referenced
this pull request
Oct 25, 2017
commit c07064d31a4d7ee0533fec144648d93873c0dd17
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Oct 18 00:11:00 2017 +0200
- Update version number
modified: storage/connect/ha_connect.cc
- Include MONGO in all Java enabled distributions
Mongo will be enabled only for 10.2 and 10.3
modified: storage/connect/CMakeLists.txt
- Change JDBC_SUPPORT to JAVA_SUPPORT which also replaces MONGO_SUPPORT
MONGO_SUPPORT is now just used to enable the MONGO table type
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/mongo.cpp
modified: storage/connect/mycat.cc
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
- Move MakeSelector function from FILTER to mongo.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/mongo.cpp
- Do mongo_init only on first use of the MongoDB C Driver
This will permit to delay load the mongo lib on Windows
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/cmgoconn.h
modified: storage/connect/ha_connect.cc
- Replace NEW_VAR by a test on MYSQL_VERSION_ID
modified: storage/connect/ha_connect.cc
- Suppress enable_mongo session variable
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Make some function headers identical in .h and .cc file
(replacing const char* by PCSZ)
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- Change a parameter type from uchar* to const uchar*
(for ScanRecord and CheckRecord)
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- Changes on LIKE and NOT LIKE does not fix a bug yet
modified: storage/connect/ha_connect.cc
- Suppress PIVOT_SUPPORT (PIVOT type is unconditionnal)
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Change the strz function from inline to static
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- export the JavaConn class and the MgoColumns and IsNum functions
modified: storage/connect/javaconn.h
modified: storage/connect/json.h
modified: storage/connect/mongo.h
- Fix MDEV-13924
modified: storage/connect/jdbconn.cpp
- Make a temporary fix for the compiler bug in CalculateArray
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
- Typo
modified: storage/connect/jdbccat.h
modified: storage/connect/reldef.h
modified: storage/connect/tabext.h
modified: storage/connect/tabjmg.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/valblk.h
modified: storage/connect/value.h
modified: storage/connect/xtable.h
- Fix a bug in MONGO tests by changing 'MONGO' to $TYPE
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
- Record test results to reflect all changes
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
commit 3da90fd112e7d5ee6f0bd9c3fc3eeb4529b30e93
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Oct 11 12:21:56 2017 +0200
Fix MDEV-13924 modified: storage/connect/jdbconn.cpp
commit 2566e67da80f291414f02c7dd6a8ca3557161d26
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Sep 11 16:38:41 2017 +0200
Enable MONGO for the C driver. Modified: modified: storage/connect/CMakeLists.txt
commit 27ae11db830c5d62bbf8b8b13cab976b74efe7dd
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Sep 5 19:52:04 2017 +0200
- 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
commit f6ee6cd1d42d861fa50fea8d9a7079347b7ddfd6
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Sep 2 16:06:10 2017 +0200
- 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
commit dbef1242c41fcfde56471cb41cbf98c83224a8a3
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Aug 31 12:19:07 2017 +0200
- Import common version of CONNECT used with all MariaDB versions
modified: storage/connect/CMakeLists.txt
modified: storage/connect/JavaWrappers.jar
modified: storage/connect/array.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamzip.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/global.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/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
modified: storage/connect/myconn.cpp
modified: storage/connect/mysql-test/connect/disabled.def
modified: storage/connect/mysql-test/connect/r/alter_xml.result
modified: storage/connect/mysql-test/connect/r/drop-open-error.result
modified: storage/connect/mysql-test/connect/r/infoschema-9739.result
modified: storage/connect/mysql-test/connect/r/jdbc_new.result
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/mysql_exec.result
modified: storage/connect/mysql-test/connect/r/mysql_new.result
modified: storage/connect/mysql-test/connect/r/tbl.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/updelx.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/r/zip.result
modified: storage/connect/mysql-test/connect/t/alter_xml.test
modified: storage/connect/mysql-test/connect/t/drop-open-error.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/json.test
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
modified: storage/connect/mysql-test/connect/t/json_udf_bin.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/tbl.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
modified: storage/connect/mysql-test/connect/t/zip.test
modified: storage/connect/myutil.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/os.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
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/table.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabtbl.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/user_connect.cc
modified: storage/connect/valblk.cpp
modified: storage/connect/valblk.h
modified: storage/connect/value.cpp
commit 7f557db749a424a8df10e17fb8f322ff70eac1a2
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 27 01:11:10 2017 +0200
Fix MDEV-13621 modified: storage/connect/ha_connect.cc
commit ed77b56787870fccfab4dffb17424592cfb2c5fa
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 20 15:06:34 2017 +0200
- Fix MDEV-12422 by implementing a fake virtual "check" function.
modified: storage/connect/ha_connect.h
commit dab7553a07e1d3cc447dbd79cd7a6cc6062c9cb1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 13 16:21:30 2017 +0200
Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp
commit f02ce8ada52cc0a9e52478578517c032bcd442c7
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Aug 9 18:43:28 2017 +0200
- Fix MDEV-13463 unescape table name during detection of table structure
modified: storage/connect/myconn.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/tabjson.cpp
commit f4d9214ad508722ed1f2dd885a22fd28f12debfd
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Aug 8 15:59:20 2017 +0200
- 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
- Change the way column Jpath is retrieved
modified: storage/connect/colblk.h
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
- Fix failing ODBC test by enabling nullable for catalog tables
+ pval[n]->SetNullable(true);
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/odbconn.cpp
commit fe22a0669e63fbda098f6dcc97dd0f2f44587797
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Jul 22 18:40:20 2017 +0200
-- Fix GetUser that can cause memory leak when xp is modified.
The old xp must be poped or is never freed.
Add usrmut mutex to protect all multi-user storage handling.
Use compatible parmut mutex instead of parsec on Windows.
modified: storage/connect/ha_connect.cc
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/user_connect.cc
commit a7f1acddafd301435872e71503f31dd3fc027a80
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Jul 19 17:51:35 2017 +0200
Parenthesize set null in SetValue_pval. Modified /storage/connect/value.cpp
commit 4715a589560f824db756c9f607ea99f05f967a61
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Jul 19 00:19:03 2017 +0200
-- 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
commit c8918e1a7b6f781738a840578923e6c56cbe3861
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jul 18 13:33:49 2017 +0200
-- 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
commit 5b4e72c17a9fce81a959f1809958179b5f4774ba
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jul 4 19:16:38 2017 +0200
- Fix MDEV-13239 Suppress the restriction about no blanks
around , and = in the OPTION_LIST.
modified: storage/connect/ha_connect.cc
commit 0747149d5fc6110f01168bfba2511aff5d774f8f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Jun 30 18:15:24 2017 +0200
- 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
commit 48bc288c676f72203ec7ca3e619e8c1fed2c7248
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Jun 11 17:17:11 2017 +0200
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
commit 01af518ebbc8416df759918587b5ae7ace9d97ae
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Jun 8 18:14:33 2017 +0200
Fix MDEV-12973: Blank columns querying SQL Server
Added support of NCHAR, NVARCHAR an ROWID JDBC types.
modified: storage/connect/jdbconn.cpp
commit b7ea5496f24e96f97ce3d76416e65b01a87e32b5
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jun 6 17:26:51 2017 +0200
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
commit 79d1ccb481f8bfc2a6208c0831f4310488be619f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Jun 1 10:10:39 2017 +0200
Protect Info function against NULL g pointer
modified: storage/connect/ha_connect.cc
Update failing test
modified: storage/connect/mysql-test/connect/r/drop-open-error.result
modified: storage/connect/mysql-test/connect/t/drop-open-error.test
commit 65bc45636ac3489a0d9776d00c8d42365c4581a4
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun May 28 00:56:15 2017 +0200
restore last version
commit 1387a3a28fb1649cf77b119364044b5170997a78
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun May 28 00:53:14 2017 +0200
new version
commit e720e502133704020c8a5b24b440fbc791f3bb31
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue May 23 22:59:44 2017 +0200
Fix bug: Discovery of JSON table fails in DEBUG mode
when NO MONGO support. (tdb->Uri is uninitialized)
modified: storage/connect/tabjson.cpp
commit 37235293b0c412d2793b300523496de3751e8b3f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue May 23 14:48:49 2017 +0200
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
commit 8f66819611fdc1339fddda1ba701746b8a61f9c2
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri May 12 11:52:03 2017 +0200
Fix column types wrongly set to TYPE_STRING in JSONColumns
when the column contains NULL values.
modified: storage/connect/tabjson.cpp
MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos.
modified: storage/connect/ha_connect.cc
commit ea7081bfa2a0a53958c1a9e8f57c2b758ac97c4d
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 11 17:23:02 2017 +0200
Fix wrong value of JSON column
When null and the column is NOT NULL the value was not reset.
modified: storage/connect/tabjson.cpp
commit 2195f5dc02b0979e700b76c33b9e4cbc42492bbf
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 11 10:35:14 2017 +0200
Fix converting bstr_t string to set error message
modified: storage/connect/domdoc.cpp
Fix MDEV-12768: -Wformat-overflow compile warnings
modified: storage/connect/global.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabvct.cpp
Typo (in external_lock)
modified: storage/connect/ha_connect.cc
Remove some warnings
modified: storage/connect/odbconn.cpp
modified: storage/connect/tabmysql.cpp
Add MEM_RESERVE flag to virtualAlloc
modified: storage/connect/plgdbutl.cpp
Fix MDEV-12573:
Accept=1 may show incorrect value for NULL column in CONNECT TBL
modified: storage/connect/tabutil.cpp
Fix wrong setting of key size when greater than 2G
modified: storage/connect/xindex.cpp
commit 9d6677b5eac399ada32ffd282e2028a4e253035a
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon May 8 14:46:15 2017 +0200
_Null_terminated_ not recognized by gcc
commit 40a56581b0ec2ec8d80ac472a969ca7a68e30695
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon May 8 12:42:12 2017 +0200
Fixing MDEV-12149: compile errors on Windows with /Zc:strictStrings
Introduce typedef PCSZ and replace PSZ by it where it matters
All done on CONNECT but compile still fails because of an included system file
modified: storage/connect/array.cpp
modified: storage/connect/catalog.h
modified: storage/connect/colblk.cpp
modified: storage/connect/colblk.h
modified: storage/connect/domdoc.cpp
modified: storage/connect/domdoc.h
modified: storage/connect/filamdbf.cpp
modified: storage/connect/filamdbf.h
modified: storage/connect/filamfix.cpp
modified: storage/connect/filamgz.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamvct.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/libdoc.cpp
modified: storage/connect/macutil.cpp
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
modified: storage/connect/myutil.h
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plgxml.cpp
modified: storage/connect/plgxml.h
modified: storage/connect/plugutil.cpp
modified: storage/connect/preparse.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfix.h
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabfmt.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabmac.cpp
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabpivot.h
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabsys.h
modified: storage/connect/tabutil.cpp
modified: storage/connect/tabutil.h
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabvir.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/tabzip.cpp
modified: storage/connect/tabzip.h
modified: storage/connect/valblk.cpp
modified: storage/connect/valblk.h
modified: storage/connect/value.cpp
modified: storage/connect/value.h
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
modified: storage/connect/xtable.h
commit e7d91cd78310948c51ee67c532dca1c6a32fc677
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat May 6 23:43:02 2017 +0200
Prepare fixing MDEV-12149
compile errors on Windows with /Zc:strictStrings
Introduce typedef PCSZ and replace PSZ by it where it matters
modified: storage/connect/colblk.h
modified: storage/connect/connect.cc
modified: storage/connect/domdoc.cpp
modified: storage/connect/domdoc.h
modified: storage/connect/filamdbf.cpp
modified: storage/connect/filamdbf.h
modified: storage/connect/filamtxt.h
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamvct.h
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.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/odbccat.h
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/os.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgxml.cpp
modified: storage/connect/plgxml.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabfix.h
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmgo.h
modified: storage/connect/tabmul.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabsys.h
modified: storage/connect/tabwmi.cpp
modified: storage/connect/tabwmi.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/tabzip.h
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
modified: storage/connect/xtable.h
commit d75d61cd6f505119f11ddaf42b6de087c8cbbdc8
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri May 5 23:56:16 2017 +0200
Fix MDEV-12603 Insert replaces values in ZIP file
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.h
Fix MDEV-12686 Handle null in json
Fix MDEV-12688 Insert does not handle type TINYINT
modified: storage/connect/json.cpp
modified: storage/connect/tabjson.cpp
commit fd166e03773ed729ac952647deb32458cc835790
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 4 18:49:00 2017 +0200
Fix MDEV-12653 Cannot add index for ZIP CONNECT table
modified: storage/connect/filamzip.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/xindex.cpp
commit ce3c7cd97284fb3edf4e0de6797678d5a54d0702
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 10:39:32 2017 +0200
Handle error return from SetPath
commit 2d85b10060c5ea63dc61561407a6f784db8841ef
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 09:10:26 2017 +0200
Fix gcc compile error. modified: storage/connect/tabmul.cpp
commit cd337a3730828e3287b0b291430940209bc52594
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 01:06:00 2017 +0200
Fix MDEV-12587 MariaDB CONNECT DIR Type
- Subfolder Option: SELECT Query Never Ends
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
Work on MDEV-12667 Crash when using JSON tables
modified: storage/connect/tabmgo.cpp
modified: storage/connect/connect.cc
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
Work on MONGO and MGO types
modified: storage/connect/mongofam.cpp
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Change Base offset for DIR tables on Linux
modified: storage/connect/reldef.cpp
Typo
modified: storage/connect/catalog.h
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
Disable all json tests
modified: storage/connect/mysql-test/connect/disabled.def
commit 2f9db4ef705414cd84eef9ee78626779aff76678
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Apr 29 23:33:10 2017 +0200
Fix MDEV-12631 valgrind warning for zipped tables
modified: storage/connect/filamzip.cpp
Add to STRING a member for testing OOM condition
modified: storage/connect/xtable.h
Work on MONGO type and add some of its features to JSON MGO tables
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/mongofam.cpp
modified: storage/connect/mongofam.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
commit b6135bb51e924892f0fc5ebf13e9f5c0980e059d
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Apr 26 18:38:32 2017 +0200
Continue working on MONGO tables
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Add Trc to STRING allowing to test for truncation (ex oom)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabext.cpp
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
commit 36206acc2f71db897d037b4b8fe7257012327439
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Apr 25 10:58:34 2017 +0200
Work on new MONGO table type
Handle discovery, insert, update and delete
Add support for Pipeline
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Handle double call to CondPush
Cond moved to TDB
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabodbc.cpp
modified: storage/connect/xtable.h
Add building Mongo selector to FILTER
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
Change Print function of values (needed by FILTER)
modified: storage/connect/value.cpp
modified: storage/connect/value.h
Fix crash when dbname is null forJSON MGO tables
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
Fix MDEV-12520: Decimal values can be truncated for JDBC tables
modified: storage/connect/jdbconn.cpp
Fix bug. Date value was null when retrieved from a json expanded array.
modified: storage/connect/tabjson.cpp
commit 0149f9c2a192b7603619a57c3ff71463258b1121
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Apr 17 10:44:51 2017 +0200
Add MONGO table type
new file: storage/connect/tabmgo.cpp
new file: storage/connect/tabmgo.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
modified: storage/connect/plgdbsem.h
Fix crash when dbname is null forJSON MGO tables
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
commit 95af77b1f734a30742d1671e3223d5454d238809
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Apr 14 12:58:47 2017 +0200
Comment out in CMakeLists.txt
commit ff704368c050e61e0fe1cdc08bccc3aec09dddd5
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 13 23:52:39 2017 +0200
Add mongoDB access to json tables.
Finalize replacement of longjmp by throw.
modified: storage/connect/CMakeLists.txt
modified: storage/connect/array.cpp
modified: storage/connect/blkfil.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabvct.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/valblk.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
commit 9262ae65fc66a19f40e53568dd22ea1666c2d4fb
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 13 21:30:33 2017 +0200
Add mongoDB access to json tables.
Filalize replacement oflongjmp by throw.
modified: storage/connect/CMakeLists.txt
modified: storage/connect/array.cpp
modified: storage/connect/blkfil.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabvct.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/valblk.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
commit 2c16792995d98fe2c98eb6c6575ba30b3653ca25
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 6 19:45:19 2017 +0200
Fix bug. Date value was null when retrieved from a json expanded array.
modified: storage/connect/tabjson.cpp
Assume timestamp is in milliseconds when it is a big integer
that is multiple of 1000.
modified: storage/connect/value.cpp
commit fcfcd99e64256ecff7a6ec35aefdb0d35cfd25c0
Merge: 332c6176903 64a37f6cab0
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 6 00:44:53 2017 +0200
Commit resolved files
commit 332c617690357047dfc125defb7a6a5bf104e319
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Apr 5 10:22:58 2017 +0200
Export TDBJSN class so it can be used by EOM tables
modified: storage/connect/filamtxt.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
commit 64a37f6cab054213aeadd9708acc66cbd8f239e7
Merge: 85239bdfebd a7bb9e8fdbd
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Wed Apr 5 09:43:36 2017 +0300
Merge pull request #352 from grooverdan/10.1-xtradb-fil_crypt_rotate_page
xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE
commit a7bb9e8fdbdd5a3a01910117ef54c0fe09374de2
Author: Daniel Black <daniel.black@au.ibm.com>
Date: Wed Apr 5 16:29:08 2017 +1000
xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE not space
like 9a218f4fb871c1169dd6015a3be9d965929dbd1f fil_crypt_rotate_page
- space_id should be compared to TRX_SYS_SPACE not space
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
commit 85239bdfebd60de2798c79271a057cfde16e5f00
Merge: 9505c968393 9a218f4fb87
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Wed Apr 5 08:40:47 2017 +0300
Merge pull request #350 from grooverdan/10.1-TRX_SYS_PAGE_NO
fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not space
commit 9a218f4fb871c1169dd6015a3be9d965929dbd1f
Author: Daniel Black <daniel.black@au.ibm.com>
Date: Tue Apr 4 15:47:21 2017 +1000
fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not space
Fixes compile error that highlights problem:
/source/storage/innobase/fil/fil0crypt.cc: In function 'void fil_crypt_rotate_page(const key_state_t*, rotate_thread_t*)':
/source/storage/innobase/fil/fil0crypt.cc:1770:15: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
commit 9505c9683930290c1e028043940ae8512a6ca040
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Mon Apr 3 19:36:54 2017 +0300
MDEV-12428 SIGSEGV in buf_page_decrypt_after_read() during DDL
Also, some MDEV-11738/MDEV-11581 post-push fixes.
In MariaDB 10.1, there is no fil_space_t::is_being_truncated field,
and the predicates fil_space_t::stop_new_ops and fil_space_t::is_stopping()
are interchangeable. I requested the fil_space_t::is_stopping() to be added
in the review, but some added checks for fil_space_t::stop_new_ops were
not replaced with calls to fil_space_t::is_stopping().
buf_page_decrypt_after_read(): In this low-level I/O operation, we must
look up the tablespace if it exists, even though future I/O operations
have been blocked on it due to a pending DDL operation, such as DROP TABLE
or TRUNCATE TABLE or other table-rebuilding operations (ALTER, OPTIMIZE).
Pass a parameter to fil_space_acquire_low() telling that we are performing
a low-level I/O operation and the fil_space_t::is_stopping() status should
be ignored.
commit ac8218a0be280ac834904e5579554d9ea3f92aeb
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 31 17:40:42 2017 +0200
fix Ninja builds for AWS SDK
specify BUILD_BYPRODUCTS, ninja needs it
commit 31896aa6e21fd112b929350156b2995b4033506d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 31 15:25:35 2017 +0200
put all aws_key_management plugin files into plugin/aws_key_management
that is, download AWS SDK there, not into the builddir root.
and .gitignore them all.
commit 9de7386f6f029985e65e02a1d98240f6808020aa
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri Mar 31 16:01:37 2017 +0000
AWS KMS plugin : Fix building in case AWS C++ SDK was preinstalled
into non-standard compiler/linker path (e.g vcpkg on Windows).
Also fix linking with static preinstalled aws c++ sdk libraries
commit a00517ac9707ffd51c092f5af5d198c5ee789bb4
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 28 19:34:51 2017 +0200
restore the correct linking of ed25519 plugin
* add a clarifying comment
* apply /wd4244 /wd4146 to ref10 source files, not to the library
commit 9ab9a28b5d9ff7fd175ae64b0d9e3c984dfb0abf
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 27 11:04:06 2017 +0200
disable innodb snappy for release builds
commit c56b896c17f7f4992ef871c51673b059a70795d4
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue Mar 28 12:28:09 2017 +0300
Fix test failure on debug_key_management test.
commit 8bd1f06c5adb748ccab11f75262b7b0f1f5b92d0
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Mar 27 15:51:39 2017 +0200
Return to original version of jdbc.test
commit efe99828739e4e570aeb7e6a370dbef0b1c33605
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Mar 27 15:40:07 2017 +0200
Fix crash when a line is not ended by \n.
modified: storage/connect/filamap.cpp
Add specifying a password when reading zipped tables.
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
Try Vaintroub suggestion
modified: storage/connect/mysql-test/connect/t/jdbc.test
commit ba298b1f022aa5e1247d07a97325c0a09bdd1dc2
Merge: 716188f1d40 c51fc679f50
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Fri Mar 24 18:20:09 2017 +0200
Merge 10.0 into 10.1
commit 716188f1d407acf8181966396d6c0923716f4546
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri Mar 24 10:02:31 2017 +0100
Fix some warnings on Windows compilation
- silence warnings in ed25519 reference implementation
- fix signed/unsigned warning in popular header item_func.h
commit d7c35a999203c98e772241f1c7858253dd96ac89
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu Mar 23 19:28:36 2017 +0000
Fix compiler error
commit e5b67a46bcb75a751f5906f19694971bc803d67c
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu Mar 23 11:48:56 2017 +0000
MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by THD::start_utime
commit 09a2107b1b2f5567b8a50afec9e54a33284c6233
Merge: bbf0c9d4c35 0d622bed4f1
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 21 19:20:44 2017 +0100
Merge branch '10.0' into 10.1
commit bbf0c9d4c35034c8634cd9607712d94fac089127
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 16 09:07:20 2017 +0100
cleanup: pfs_upgrade* tests
commit 386ef08704de7b8070823e5519a530dad259fe11
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 13 10:54:08 2017 +0100
MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64le
verify that tests don't leave mysql_upgrade_info in datadir
commit cf1ca7473604d640ad3f20d1ec89d293b9748c73
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 18 12:42:46 2017 +0100
Typo
commit d9b7433c98e6001b32d4489125a3366c79be14b1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 18 10:40:51 2017 +0100
Fix MDEV-12220: add MODE_READX to permissible index read
modified: storage/connect/connect.cc
commit 932a4401f092f6fac1ad4242cc1923dffa56f9cf
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 17 19:00:30 2017 +0100
Fix MDEV-12220: Crash when doing UPDATE or DELETE on an external
table (ODBC, JDBC, MYSQL) with a WHERE clause on an indexed column.
Also fix a bugs in TDBEXT::MakeCommand (use of uninitialised Quote)
Add in this function the eventual Schema (database) prefixing.
modified: storage/connect/connect.cc
modified: storage/connect/tabext.cpp
commit b1ec35b90303446d2f1a5810455bcafbc091f928
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Thu Mar 16 17:30:13 2017 +0200
Add assertions when key rotation list is used.
commit c333cae652491998c34526ab0b5bfc3ecb2fe474
Author: =Ian Gilfillan <github@greenman.co.za>
Date: Thu Mar 16 13:35:36 2017 +0200
MDEV-11964 Add more stub missing man pages
commit 854359ffc519292470d29ebcbfe9416968b56da0
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue Mar 14 20:44:25 2017 +0000
Fix AWS KMS plugin's compile error
Do not include base64.h, it was recently removed.
commit 50eb40a2a8aa3af6cc271f6028f4d6d74301d030
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue Mar 14 12:56:01 2017 +0200
MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing
MDEV-11581: Mariadb starts InnoDB encryption threads
when key has not changed or data scrubbing turned off
Background: Key rotation is based on background threads
(innodb-encryption-threads) periodically going through
all tablespaces on fil_system. For each tablespace
current used key version is compared to max key age
(innodb-encryption-rotate-key-age). This process
naturally takes CPU. Similarly, in same time need for
scrubbing is investigated. Currently, key rotation
is fully supported on Amazon AWS key management plugin
only but InnoDB does not have knowledge what key
management plugin is used.
This patch re-purposes innodb-encryption-rotate-key-age=0
to disable key rotation and background data scrubbing.
All new tables are added to special list for key rotation
and key rotation is based on sending a event to
background encryption threads instead of using periodic
checking (i.e. timeout).
fil0fil.cc: Added functions fil_space_acquire_low()
to acquire a tablespace when it could be dropped concurrently.
This function is used from fil_space_acquire() or
fil_space_acquire_silent() that will not print
any messages if we try to acquire space that does not exist.
fil_space_release() to release a acquired tablespace.
fil_space_next() to iterate tablespaces in fil_system
using fil_space_acquire() and fil_space_release().
Similarly, fil_space_keyrotation_next() to iterate new
list fil_system->rotation_list where new tables.
are added if key rotation is disabled.
Removed unnecessary functions fil_get_first_space_safe()
fil_get_next_space_safe()
fil_node_open_file(): After page 0 is read read also
crypt_info if it is not yet read.
btr_scrub_lock_dict_func()
buf_page_check_corrupt()
buf_page_encrypt_before_write()
buf_merge_or_delete_for_page()
lock_print_info_all_transactions()
row_fts_psort_info_init()
row_truncate_table_for_mysql()
row_drop_table_for_mysql()
Use fil_space_acquire()/release() to access fil_space_t.
buf_page_decrypt_after_read():
Use fil_space_get_crypt_data() because at this point
we might not yet have read page 0.
fil0crypt.cc/fil0fil.h: Lot of changes. Pass fil_space_t* directly
to functions needing it and store fil_space_t* to rotation state.
Use fil_space_acquire()/release() when iterating tablespaces
and removed unnecessary is_closing from fil_crypt_t. Use
fil_space_t::is_stopping() to detect when access to
tablespace should be stopped. Removed unnecessary
fil_space_get_crypt_data().
fil_space_create(): Inform key rotation that there could
be something to do if key rotation is disabled and new
table with encryption enabled is created.
Remove unnecessary functions fil_get_first_space_safe()
and fil_get_next_space_safe(). fil_space_acquire()
and fil_space_release() are used instead. Moved
fil_space_get_crypt_data() and fil_space_set_crypt_data()
to fil0crypt.cc.
fsp_header_init(): Acquire fil_space_t*, write crypt_data
and release space.
check_table_options()
Renamed FIL_SPACE_ENCRYPTION_* TO FIL_ENCRYPTION_*
i_s.cc: Added ROTATING_OR_FLUSHING field to
information_schema.innodb_tablespace_encryption
to show current status of key rotation.
commit a2f34809e55c492af9a23d43840133f01528df7b
Author: Daniel Bartholomew <db@dbart.us>
Date: Tue Mar 14 09:56:05 2017 -0400
bump the VERSION
commit 98be67266dc2f331e64ed5d875154fc6352f262a
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon Mar 13 23:13:24 2017 +0000
Fix truncation of affected rows and insert id in select_insert::send_ok_packet
commit 9dc10d5851ab4ff38d81e68858de56fbb1d6743d
Merge: 68be011cf2e 032678ad184
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Mon Mar 13 19:17:34 2017 +0200
Merge 10.0 into 10.1
commit 68be011cf2ec96a622db857fe9c418380d106d0d
Author: Elena Stepanova <elenst@montyprogram.com>
Date: Sat Mar 11 20:59:52 2017 +0200
Updated list of unstable tests for 10.1.22
commit 20338443197590beb943e8e1eed17cf95d2a51e0
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sat Mar 11 12:42:55 2017 +0100
test failures in buildbot
commit e5f5457b6fdada826fca23e17b6925e2f9634a03
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 11 14:10:34 2017 +0100
Also order the result of multiple=1 table, otherwise being different
on Linux and Windows causing the test to fail.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit f0ec34002a98eeb669cb254eaba6a3d678a58cc1
Author: iangilfillan <github@greenman.co.za>
Date: Fri Feb 10 13:26:55 2017 +0200
Correct FSF address
commit 2a0ae1c90acc6332606144719764cb5fc730bf3b
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 7 19:21:42 2017 +0100
MDEV-11965 -Werror should not appear in released tarballs
commit 5d40ed864eb91314c894c713cd0d3d03c62ec8c5
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 7 19:17:37 2017 +0100
MDEV-11752 Unsafe strmov - function definition in include/m_string.h
assert that strmov() cannot be used on overlapping strings.
(because strpcpy cannot)
commit e0a03ca30aa6f91daf7ea519a57d85e54dc49927
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 01:27:34 2017 +0100
ed25519 plugin: simplify the api
various ed25519/ref10 api simplifications for our specific use case
commit 7120118a5e97477778715ebdc8e4fba548a6dc87
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 16:18:16 2017 +0100
MDEV-12160 Modern alternative to the SHA1 authentication plugin
ED25519 authentication plugin
commit 269ab56f8b4056ec63e712ba305761dd835ea10e
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 22:42:00 2017 +0100
small plugin API related fixes
* define MYSQL_DYNAMIC_PLUGIN only for server plugins
* don't typedef my_bool in mysql.h if plugin.h has already done it
* fix the include guard in plugin.h
commit 227f63db3b0b9a1ce29c37f1c104ba5d204d0392
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 19:37:48 2017 +0100
cleanup: sort various lists of services
commit 0877eff4012ab1184112814a3492d23bf266f848
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 19:34:22 2017 +0100
thd_rnd service
commit 6305533de2fd38d43c149d4d7c847f65d68205c7
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 17:32:18 2017 +0100
Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFO
so that auth plugins could use various thd services
commit 051851b9a673e38d12612ea92d8a8913b8f0ca45
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 17:05:03 2017 +0100
base64 service
commit 70a2efde0352052fce5a44481055542e0b050048
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 15:31:25 2017 +0100
remove old API for SHA2
commit d6a7aece0826e0c115eb21912527c77596c1305e
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 13:06:03 2017 +0100
my_sha2 service
commit bd1139ad2722cf8717cd1aaac4431f369d39562f
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 12:45:36 2017 +0100
cleanup: generalize my_sha1.cc
move most of the code into my_sha.ic, making it independent
from the actual SHAx variant.
commit 6cddd12ad6eeea82b1087574e5dd5cb9accd7641
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 15:50:32 2017 +0100
make sql_udf.cc to shorten dlerror() messages
just as sql_plugin.cc does
commit 2b1bbac5fa881b8e135dbad3e0ff6b9e2763e24d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 20:51:31 2017 +0100
cleanup: remove a duplicate file
commit aa51b559abec01eca9f5a7628e4fe0a106ee8e52
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 15:07:46 2017 +0100
typo fixed
commit 0633d0e2ed606a7fe51d0cbf08c60c5a7d5572f6
Author: Sergei Golubchik <serg@mariadb.org>
Date: Wed Mar 8 14:54:12 2017 +0100
don't show 'performance_schema_%_classes_lost' variables in tests
because FLUSH STATUS does not reset them, so their values
are affected by previously run tests since the last server restart.
commit 3d06f0f72cbabe833036f920e9452cd6ef46e5aa
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sat Mar 4 17:17:00 2017 +0100
MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
fix the patch. add tests
commit c372388e4862938037f98b6e4936bc61872354dd
Author: Hartmut Holzgraefe <hartmut@mariadb.com>
Date: Tue Feb 7 22:56:28 2017 +0100
make mysql_upgrade try to install missing storage engine plugins (MDEV-11942)
commit 8f1ca5e311bda92d4e901aae8ec5c47597d0f934
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 3 15:27:19 2017 +0100
MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engine
Try harder to show the table's engine.
If the table's engine is not loaded, the table won't open.
But we can still read the engine name from frm as a string.
commit 48b1d175345caa3c644597044751906a04106b91
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 15:36:18 2017 +0100
MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engine
Make SELECT <columns> FROM I_S.TABLES behave identically independently
from whether <columns> require opening the table in engine or
<columns> can be filled with only opening the frm.
In particular, fill_schema_table_from_frm() should not silently skip
frms with unknown engine, but should fill the I_S.TABLES row
with NULLs just like fill_schema_table_by_open() does.
commit 25c32c89f14cba402a42a61a8a371ce515610899
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 14:04:14 2017 +0100
trivial cleanup
commit 8eb66bc382295003e5da5ff50365d62def30f52d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 20:59:29 2017 +0100
cleanup: change dd_frm_type() to return the engine name, not legacy_db_type
this simplifies the code and avoids unnecessary conversions back and forth.
and it works even if the engine is not installed.
commit 1c8d2121ab0e9ca0d8a8fccdd85da1072ef30815
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 06:53:07 2017 +0100
don't do vio_description(NULL)
this fixes the crash of innodb.innodb-blob --ps-protocol
commit 5fa04aae9ec94428a68ef4f6f681564111933c11
Author: Sergei Golubchik <serg@mariadb.org>
Date: Wed Mar 1 23:52:35 2017 +0100
MDEV-11842 Fail to insert on a table where a field has no default
has_no_default_value() should only fail the insert in the strict mode.
Additionally, don't check for "all fields are given values" twice,
it'll produce duplicate warnings.
commit b6a1d6538b4d2001be20fe0d8f470874c744f0a2
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 10 16:25:01 2017 +0100
compiler warnings
commit 2d573a6c5a471ec187b9bdc4db6503dad9639650
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 10 17:53:36 2017 +0100
CONNECT Storage Engine: Support of ENUM and SET column types
for MYSQL tables.
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
Order the result of multiple=3 table, otherwise being different
on Linux and Windows causing the test to fail.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit 0094b6581df1530821608327df50b8479e1dc0f8
Merge: 814d0507604 1d47bd61d55
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Fri Mar 10 15:16:13 2017 +0200
Merge 10.0 into 10.1
commit 814d0507604192d1da18eb2e30529e5559ce140e
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
Date: Fri Mar 10 14:07:22 2017 +0200
MDEV-12215: main.repair_symlink-5543 fails in buildbot
If openat is present on the system and it tries to open a symlink with
O_NOFOLLOW, we get errno 40.
If openat is not present on the system, we use the alternative open call, with
slightly different logic. IF the symlink doesn't point to a valid file,
we get errno 20. This test uses an invalid symlink on the table t1.MYD.
commit 18de8296182f42cdf663573949a82950b72af8fc
Author: iangilfillan <github@greenman.co.za>
Date: Thu Mar 9 13:18:40 2017 +0200
MDEV-11964 Add missing stub manpages
commit bf6cadf923d2e7756e037898dd3b9384dd1fc807
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 10 00:28:26 2017 +0100
CONNECT Storage Engine:
The last commited changes have brought important additions to CONNECT.
1 - Replacement of setjmp/longjump's by try/catch/throw
2 - Support of multiple tables in subdirectories
3 - Support translating ENUM to VARCHAR for MYSQL tables.
4 - Tables based on ZIP files
Support ENUM data type for MYSQL tables.
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
Fix typo causing the test to fail on Linux.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit cdc7a69ea2decf1e8f36dbaa12591abaedf05a35
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Mar 9 16:28:11 2017 +0100
CONNECT DIR tables: fix retrieving file date values under Windows.
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
commit 07d89fa59c1734b5a963943dcb93ade0c4e92e48
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
Date: Thu Mar 9 16:52:57 2017 +0200
Remove leftover merge conflict marker
commit 5aacb861f2e84e1f45d72bf34fdaffa0904a9f5b
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 14:45:52 2017 +0200
WSREP: Use TRX_ID_FMT for trx_id_t in messages.
commit b28adb6a62661b60f80c7c1b6237b74fb7cdcee2
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 15:09:44 2017 +0200
Fix an error introduced in the previous commit.
fil_parse_write_crypt_data(): Correct the comparison operator.
This was broken in commit 498f4a825b29a37cb27f1c76741987de8c510d06
which removed a signed/unsigned mismatch in these comparisons.
commit 498f4a825b29a37cb27f1c76741987de8c510d06
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 08:54:07 2017 +0200
Fix InnoDB/XtraDB compilation warnings on 32-bit builds.
commit ad0c218a440575fa6fb6634aca7a08448a4360e0
Merge: bb4ef470c24 9fe92a9770a
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Wed Mar 8 19:44:22 2017 +0200
Merge 10.0 into 10.1
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:
recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).
Report progress also via systemd using sd_notifyf().
commit 95667ae2945a6f8891ed7b49bff8b9fa19d7d1a1
Author: Olivier Bertrand <bertr…
cvicentiu
added a commit
that referenced
this pull request
Oct 26, 2017
commit c07064d31a4d7ee0533fec144648d93873c0dd17
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Oct 18 00:11:00 2017 +0200
- Update version number
modified: storage/connect/ha_connect.cc
- Include MONGO in all Java enabled distributions
Mongo will be enabled only for 10.2 and 10.3
modified: storage/connect/CMakeLists.txt
- Change JDBC_SUPPORT to JAVA_SUPPORT which also replaces MONGO_SUPPORT
MONGO_SUPPORT is now just used to enable the MONGO table type
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/mongo.cpp
modified: storage/connect/mycat.cc
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
- Move MakeSelector function from FILTER to mongo.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/jmgoconn.cpp
modified: storage/connect/mongo.cpp
- Do mongo_init only on first use of the MongoDB C Driver
This will permit to delay load the mongo lib on Windows
modified: storage/connect/cmgoconn.cpp
modified: storage/connect/cmgoconn.h
modified: storage/connect/ha_connect.cc
- Replace NEW_VAR by a test on MYSQL_VERSION_ID
modified: storage/connect/ha_connect.cc
- Suppress enable_mongo session variable
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Make some function headers identical in .h and .cc file
(replacing const char* by PCSZ)
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- Change a parameter type from uchar* to const uchar*
(for ScanRecord and CheckRecord)
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- Changes on LIKE and NOT LIKE does not fix a bug yet
modified: storage/connect/ha_connect.cc
- Suppress PIVOT_SUPPORT (PIVOT type is unconditionnal)
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
- Change the strz function from inline to static
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
- export the JavaConn class and the MgoColumns and IsNum functions
modified: storage/connect/javaconn.h
modified: storage/connect/json.h
modified: storage/connect/mongo.h
- Fix MDEV-13924
modified: storage/connect/jdbconn.cpp
- Make a temporary fix for the compiler bug in CalculateArray
modified: storage/connect/jsonudf.cpp
modified: storage/connect/tabjson.cpp
- Typo
modified: storage/connect/jdbccat.h
modified: storage/connect/reldef.h
modified: storage/connect/tabext.h
modified: storage/connect/tabjmg.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/valblk.h
modified: storage/connect/value.h
modified: storage/connect/xtable.h
- Fix a bug in MONGO tests by changing 'MONGO' to $TYPE
modified: storage/connect/mysql-test/connect/t/mongo_test.inc
- Record test results to reflect all changes
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
commit 3da90fd112e7d5ee6f0bd9c3fc3eeb4529b30e93
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Oct 11 12:21:56 2017 +0200
Fix MDEV-13924 modified: storage/connect/jdbconn.cpp
commit 2566e67da80f291414f02c7dd6a8ca3557161d26
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Sep 11 16:38:41 2017 +0200
Enable MONGO for the C driver. Modified: modified: storage/connect/CMakeLists.txt
commit 27ae11db830c5d62bbf8b8b13cab976b74efe7dd
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Sep 5 19:52:04 2017 +0200
- 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
commit f6ee6cd1d42d861fa50fea8d9a7079347b7ddfd6
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Sep 2 16:06:10 2017 +0200
- 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
commit dbef1242c41fcfde56471cb41cbf98c83224a8a3
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Aug 31 12:19:07 2017 +0200
- Import common version of CONNECT used with all MariaDB versions
modified: storage/connect/CMakeLists.txt
modified: storage/connect/JavaWrappers.jar
modified: storage/connect/array.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamzip.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/global.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/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
modified: storage/connect/myconn.cpp
modified: storage/connect/mysql-test/connect/disabled.def
modified: storage/connect/mysql-test/connect/r/alter_xml.result
modified: storage/connect/mysql-test/connect/r/drop-open-error.result
modified: storage/connect/mysql-test/connect/r/infoschema-9739.result
modified: storage/connect/mysql-test/connect/r/jdbc_new.result
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/mysql_exec.result
modified: storage/connect/mysql-test/connect/r/mysql_new.result
modified: storage/connect/mysql-test/connect/r/tbl.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/updelx.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/r/zip.result
modified: storage/connect/mysql-test/connect/t/alter_xml.test
modified: storage/connect/mysql-test/connect/t/drop-open-error.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/json.test
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
modified: storage/connect/mysql-test/connect/t/json_udf_bin.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/tbl.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
modified: storage/connect/mysql-test/connect/t/zip.test
modified: storage/connect/myutil.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/os.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
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/table.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabtbl.cpp
modified: storage/connect/tabtbl.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/user_connect.cc
modified: storage/connect/valblk.cpp
modified: storage/connect/valblk.h
modified: storage/connect/value.cpp
commit 7f557db749a424a8df10e17fb8f322ff70eac1a2
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 27 01:11:10 2017 +0200
Fix MDEV-13621 modified: storage/connect/ha_connect.cc
commit ed77b56787870fccfab4dffb17424592cfb2c5fa
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 20 15:06:34 2017 +0200
- Fix MDEV-12422 by implementing a fake virtual "check" function.
modified: storage/connect/ha_connect.h
commit dab7553a07e1d3cc447dbd79cd7a6cc6062c9cb1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Aug 13 16:21:30 2017 +0200
Fix MDEV-13503 Modified: storage/connect/jdbconn.cpp
commit f02ce8ada52cc0a9e52478578517c032bcd442c7
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Aug 9 18:43:28 2017 +0200
- Fix MDEV-13463 unescape table name during detection of table structure
modified: storage/connect/myconn.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/tabjson.cpp
commit f4d9214ad508722ed1f2dd885a22fd28f12debfd
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Aug 8 15:59:20 2017 +0200
- 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
- Change the way column Jpath is retrieved
modified: storage/connect/colblk.h
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
- Fix failing ODBC test by enabling nullable for catalog tables
+ pval[n]->SetNullable(true);
modified: storage/connect/mysql-test/connect/r/odbc_oracle.result
modified: storage/connect/odbconn.cpp
commit fe22a0669e63fbda098f6dcc97dd0f2f44587797
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Jul 22 18:40:20 2017 +0200
-- Fix GetUser that can cause memory leak when xp is modified.
The old xp must be poped or is never freed.
Add usrmut mutex to protect all multi-user storage handling.
Use compatible parmut mutex instead of parsec on Windows.
modified: storage/connect/ha_connect.cc
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/user_connect.cc
commit a7f1acddafd301435872e71503f31dd3fc027a80
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Jul 19 17:51:35 2017 +0200
Parenthesize set null in SetValue_pval. Modified /storage/connect/value.cpp
commit 4715a589560f824db756c9f607ea99f05f967a61
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Jul 19 00:19:03 2017 +0200
-- 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
commit c8918e1a7b6f781738a840578923e6c56cbe3861
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jul 18 13:33:49 2017 +0200
-- 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
commit 5b4e72c17a9fce81a959f1809958179b5f4774ba
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jul 4 19:16:38 2017 +0200
- Fix MDEV-13239 Suppress the restriction about no blanks
around , and = in the OPTION_LIST.
modified: storage/connect/ha_connect.cc
commit 0747149d5fc6110f01168bfba2511aff5d774f8f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Jun 30 18:15:24 2017 +0200
- 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
commit 48bc288c676f72203ec7ca3e619e8c1fed2c7248
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Jun 11 17:17:11 2017 +0200
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
commit 01af518ebbc8416df759918587b5ae7ace9d97ae
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Jun 8 18:14:33 2017 +0200
Fix MDEV-12973: Blank columns querying SQL Server
Added support of NCHAR, NVARCHAR an ROWID JDBC types.
modified: storage/connect/jdbconn.cpp
commit b7ea5496f24e96f97ce3d76416e65b01a87e32b5
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Jun 6 17:26:51 2017 +0200
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
commit 79d1ccb481f8bfc2a6208c0831f4310488be619f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Jun 1 10:10:39 2017 +0200
Protect Info function against NULL g pointer
modified: storage/connect/ha_connect.cc
Update failing test
modified: storage/connect/mysql-test/connect/r/drop-open-error.result
modified: storage/connect/mysql-test/connect/t/drop-open-error.test
commit 65bc45636ac3489a0d9776d00c8d42365c4581a4
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun May 28 00:56:15 2017 +0200
restore last version
commit 1387a3a28fb1649cf77b119364044b5170997a78
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun May 28 00:53:14 2017 +0200
new version
commit e720e502133704020c8a5b24b440fbc791f3bb31
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue May 23 22:59:44 2017 +0200
Fix bug: Discovery of JSON table fails in DEBUG mode
when NO MONGO support. (tdb->Uri is uninitialized)
modified: storage/connect/tabjson.cpp
commit 37235293b0c412d2793b300523496de3751e8b3f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue May 23 14:48:49 2017 +0200
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
commit 8f66819611fdc1339fddda1ba701746b8a61f9c2
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri May 12 11:52:03 2017 +0200
Fix column types wrongly set to TYPE_STRING in JSONColumns
when the column contains NULL values.
modified: storage/connect/tabjson.cpp
MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos.
modified: storage/connect/ha_connect.cc
commit ea7081bfa2a0a53958c1a9e8f57c2b758ac97c4d
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 11 17:23:02 2017 +0200
Fix wrong value of JSON column
When null and the column is NOT NULL the value was not reset.
modified: storage/connect/tabjson.cpp
commit 2195f5dc02b0979e700b76c33b9e4cbc42492bbf
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 11 10:35:14 2017 +0200
Fix converting bstr_t string to set error message
modified: storage/connect/domdoc.cpp
Fix MDEV-12768: -Wformat-overflow compile warnings
modified: storage/connect/global.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabvct.cpp
Typo (in external_lock)
modified: storage/connect/ha_connect.cc
Remove some warnings
modified: storage/connect/odbconn.cpp
modified: storage/connect/tabmysql.cpp
Add MEM_RESERVE flag to virtualAlloc
modified: storage/connect/plgdbutl.cpp
Fix MDEV-12573:
Accept=1 may show incorrect value for NULL column in CONNECT TBL
modified: storage/connect/tabutil.cpp
Fix wrong setting of key size when greater than 2G
modified: storage/connect/xindex.cpp
commit 9d6677b5eac399ada32ffd282e2028a4e253035a
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon May 8 14:46:15 2017 +0200
_Null_terminated_ not recognized by gcc
commit 40a56581b0ec2ec8d80ac472a969ca7a68e30695
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon May 8 12:42:12 2017 +0200
Fixing MDEV-12149: compile errors on Windows with /Zc:strictStrings
Introduce typedef PCSZ and replace PSZ by it where it matters
All done on CONNECT but compile still fails because of an included system file
modified: storage/connect/array.cpp
modified: storage/connect/catalog.h
modified: storage/connect/colblk.cpp
modified: storage/connect/colblk.h
modified: storage/connect/domdoc.cpp
modified: storage/connect/domdoc.h
modified: storage/connect/filamdbf.cpp
modified: storage/connect/filamdbf.h
modified: storage/connect/filamfix.cpp
modified: storage/connect/filamgz.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamvct.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/jdbconn.cpp
modified: storage/connect/jdbconn.h
modified: storage/connect/json.cpp
modified: storage/connect/json.h
modified: storage/connect/jsonudf.cpp
modified: storage/connect/jsonudf.h
modified: storage/connect/libdoc.cpp
modified: storage/connect/macutil.cpp
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
modified: storage/connect/myutil.h
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plgxml.cpp
modified: storage/connect/plgxml.h
modified: storage/connect/plugutil.cpp
modified: storage/connect/preparse.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfix.h
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabfmt.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabmac.cpp
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabpivot.h
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabsys.h
modified: storage/connect/tabutil.cpp
modified: storage/connect/tabutil.h
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabvir.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/tabzip.cpp
modified: storage/connect/tabzip.h
modified: storage/connect/valblk.cpp
modified: storage/connect/valblk.h
modified: storage/connect/value.cpp
modified: storage/connect/value.h
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
modified: storage/connect/xtable.h
commit e7d91cd78310948c51ee67c532dca1c6a32fc677
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat May 6 23:43:02 2017 +0200
Prepare fixing MDEV-12149
compile errors on Windows with /Zc:strictStrings
Introduce typedef PCSZ and replace PSZ by it where it matters
modified: storage/connect/colblk.h
modified: storage/connect/connect.cc
modified: storage/connect/domdoc.cpp
modified: storage/connect/domdoc.h
modified: storage/connect/filamdbf.cpp
modified: storage/connect/filamdbf.h
modified: storage/connect/filamtxt.h
modified: storage/connect/filamvct.cpp
modified: storage/connect/filamvct.h
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.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/odbccat.h
modified: storage/connect/odbconn.cpp
modified: storage/connect/odbconn.h
modified: storage/connect/os.h
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgxml.cpp
modified: storage/connect/plgxml.h
modified: storage/connect/reldef.cpp
modified: storage/connect/reldef.h
modified: storage/connect/tabdos.h
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabfix.h
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabjdbc.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmgo.h
modified: storage/connect/tabmul.h
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/tabodbc.h
modified: storage/connect/tabsys.h
modified: storage/connect/tabwmi.cpp
modified: storage/connect/tabwmi.h
modified: storage/connect/tabxml.cpp
modified: storage/connect/tabxml.h
modified: storage/connect/tabzip.h
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
modified: storage/connect/xtable.h
commit d75d61cd6f505119f11ddaf42b6de087c8cbbdc8
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri May 5 23:56:16 2017 +0200
Fix MDEV-12603 Insert replaces values in ZIP file
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.h
Fix MDEV-12686 Handle null in json
Fix MDEV-12688 Insert does not handle type TINYINT
modified: storage/connect/json.cpp
modified: storage/connect/tabjson.cpp
commit fd166e03773ed729ac952647deb32458cc835790
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu May 4 18:49:00 2017 +0200
Fix MDEV-12653 Cannot add index for ZIP CONNECT table
modified: storage/connect/filamzip.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/xindex.cpp
commit ce3c7cd97284fb3edf4e0de6797678d5a54d0702
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 10:39:32 2017 +0200
Handle error return from SetPath
commit 2d85b10060c5ea63dc61561407a6f784db8841ef
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 09:10:26 2017 +0200
Fix gcc compile error. modified: storage/connect/tabmul.cpp
commit cd337a3730828e3287b0b291430940209bc52594
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed May 3 01:06:00 2017 +0200
Fix MDEV-12587 MariaDB CONNECT DIR Type
- Subfolder Option: SELECT Query Never Ends
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
Work on MDEV-12667 Crash when using JSON tables
modified: storage/connect/tabmgo.cpp
modified: storage/connect/connect.cc
modified: storage/connect/ha_connect.cc
modified: storage/connect/ha_connect.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
Work on MONGO and MGO types
modified: storage/connect/mongofam.cpp
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Change Base offset for DIR tables on Linux
modified: storage/connect/reldef.cpp
Typo
modified: storage/connect/catalog.h
modified: storage/connect/mycat.cc
modified: storage/connect/mycat.h
Disable all json tests
modified: storage/connect/mysql-test/connect/disabled.def
commit 2f9db4ef705414cd84eef9ee78626779aff76678
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Apr 29 23:33:10 2017 +0200
Fix MDEV-12631 valgrind warning for zipped tables
modified: storage/connect/filamzip.cpp
Add to STRING a member for testing OOM condition
modified: storage/connect/xtable.h
Work on MONGO type and add some of its features to JSON MGO tables
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/mongofam.cpp
modified: storage/connect/mongofam.h
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
commit b6135bb51e924892f0fc5ebf13e9f5c0980e059d
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Apr 26 18:38:32 2017 +0200
Continue working on MONGO tables
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Add Trc to STRING allowing to test for truncation (ex oom)
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabext.cpp
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabmysql.h
modified: storage/connect/tabodbc.cpp
modified: storage/connect/xobject.cpp
modified: storage/connect/xobject.h
commit 36206acc2f71db897d037b4b8fe7257012327439
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Apr 25 10:58:34 2017 +0200
Work on new MONGO table type
Handle discovery, insert, update and delete
Add support for Pipeline
modified: storage/connect/tabmgo.cpp
modified: storage/connect/tabmgo.h
Handle double call to CondPush
Cond moved to TDB
modified: storage/connect/ha_connect.cc
modified: storage/connect/tabext.cpp
modified: storage/connect/tabext.h
modified: storage/connect/tabjdbc.cpp
modified: storage/connect/table.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabodbc.cpp
modified: storage/connect/xtable.h
Add building Mongo selector to FILTER
modified: storage/connect/filter.cpp
modified: storage/connect/filter.h
Change Print function of values (needed by FILTER)
modified: storage/connect/value.cpp
modified: storage/connect/value.h
Fix crash when dbname is null forJSON MGO tables
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
Fix MDEV-12520: Decimal values can be truncated for JDBC tables
modified: storage/connect/jdbconn.cpp
Fix bug. Date value was null when retrieved from a json expanded array.
modified: storage/connect/tabjson.cpp
commit 0149f9c2a192b7603619a57c3ff71463258b1121
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Apr 17 10:44:51 2017 +0200
Add MONGO table type
new file: storage/connect/tabmgo.cpp
new file: storage/connect/tabmgo.h
modified: storage/connect/ha_connect.cc
modified: storage/connect/mycat.cc
modified: storage/connect/plgdbsem.h
Fix crash when dbname is null forJSON MGO tables
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
commit 95af77b1f734a30742d1671e3223d5454d238809
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Apr 14 12:58:47 2017 +0200
Comment out in CMakeLists.txt
commit ff704368c050e61e0fe1cdc08bccc3aec09dddd5
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 13 23:52:39 2017 +0200
Add mongoDB access to json tables.
Finalize replacement of longjmp by throw.
modified: storage/connect/CMakeLists.txt
modified: storage/connect/array.cpp
modified: storage/connect/blkfil.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabvct.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/valblk.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
commit 9262ae65fc66a19f40e53568dd22ea1666c2d4fb
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 13 21:30:33 2017 +0200
Add mongoDB access to json tables.
Filalize replacement oflongjmp by throw.
modified: storage/connect/CMakeLists.txt
modified: storage/connect/array.cpp
modified: storage/connect/blkfil.cpp
modified: storage/connect/colblk.cpp
modified: storage/connect/connect.cc
modified: storage/connect/filamtxt.cpp
modified: storage/connect/filamvct.cpp
modified: storage/connect/filter.cpp
modified: storage/connect/ha_connect.cc
modified: storage/connect/jdbconn.cpp
modified: storage/connect/json.cpp
modified: storage/connect/jsonudf.cpp
modified: storage/connect/odbconn.cpp
modified: storage/connect/plgdbsem.h
modified: storage/connect/plgdbutl.cpp
modified: storage/connect/plugutil.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabfix.cpp
modified: storage/connect/tabfmt.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmysql.cpp
modified: storage/connect/tabpivot.cpp
modified: storage/connect/tabsys.cpp
modified: storage/connect/tabvct.cpp
modified: storage/connect/tabvir.cpp
modified: storage/connect/tabxml.cpp
modified: storage/connect/valblk.cpp
modified: storage/connect/value.cpp
modified: storage/connect/xindex.cpp
modified: storage/connect/xobject.cpp
commit 2c16792995d98fe2c98eb6c6575ba30b3653ca25
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 6 19:45:19 2017 +0200
Fix bug. Date value was null when retrieved from a json expanded array.
modified: storage/connect/tabjson.cpp
Assume timestamp is in milliseconds when it is a big integer
that is multiple of 1000.
modified: storage/connect/value.cpp
commit fcfcd99e64256ecff7a6ec35aefdb0d35cfd25c0
Merge: 332c6176903 64a37f6cab0
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Apr 6 00:44:53 2017 +0200
Commit resolved files
commit 332c617690357047dfc125defb7a6a5bf104e319
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Apr 5 10:22:58 2017 +0200
Export TDBJSN class so it can be used by EOM tables
modified: storage/connect/filamtxt.cpp
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabjson.cpp
modified: storage/connect/tabjson.h
commit 64a37f6cab054213aeadd9708acc66cbd8f239e7
Merge: 85239bdfebd a7bb9e8fdbd
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Wed Apr 5 09:43:36 2017 +0300
Merge pull request #352 from grooverdan/10.1-xtradb-fil_crypt_rotate_page
xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE
commit a7bb9e8fdbdd5a3a01910117ef54c0fe09374de2
Author: Daniel Black <daniel.black@au.ibm.com>
Date: Wed Apr 5 16:29:08 2017 +1000
xtradb: fil_crypt_rotate_page, space_id should be compared to TRX_SYS_SPACE not space
like 9a218f4fb871c1169dd6015a3be9d965929dbd1f fil_crypt_rotate_page
- space_id should be compared to TRX_SYS_SPACE not space
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
commit 85239bdfebd60de2798c79271a057cfde16e5f00
Merge: 9505c968393 9a218f4fb87
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Wed Apr 5 08:40:47 2017 +0300
Merge pull request #350 from grooverdan/10.1-TRX_SYS_PAGE_NO
fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not space
commit 9a218f4fb871c1169dd6015a3be9d965929dbd1f
Author: Daniel Black <daniel.black@au.ibm.com>
Date: Tue Apr 4 15:47:21 2017 +1000
fil_crypt_rotate_page - space_id should be compared to TRX_SYS_SPACE not space
Fixes compile error that highlights problem:
/source/storage/innobase/fil/fil0crypt.cc: In function 'void fil_crypt_rotate_page(const key_state_t*, rotate_thread_t*)':
/source/storage/innobase/fil/fil0crypt.cc:1770:15: error: ISO C++ forbids comparison between pointer and integer [-fpermissive]
if (space == TRX_SYS_SPACE && offset == TRX_SYS_PAGE_NO) {
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
commit 9505c9683930290c1e028043940ae8512a6ca040
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Mon Apr 3 19:36:54 2017 +0300
MDEV-12428 SIGSEGV in buf_page_decrypt_after_read() during DDL
Also, some MDEV-11738/MDEV-11581 post-push fixes.
In MariaDB 10.1, there is no fil_space_t::is_being_truncated field,
and the predicates fil_space_t::stop_new_ops and fil_space_t::is_stopping()
are interchangeable. I requested the fil_space_t::is_stopping() to be added
in the review, but some added checks for fil_space_t::stop_new_ops were
not replaced with calls to fil_space_t::is_stopping().
buf_page_decrypt_after_read(): In this low-level I/O operation, we must
look up the tablespace if it exists, even though future I/O operations
have been blocked on it due to a pending DDL operation, such as DROP TABLE
or TRUNCATE TABLE or other table-rebuilding operations (ALTER, OPTIMIZE).
Pass a parameter to fil_space_acquire_low() telling that we are performing
a low-level I/O operation and the fil_space_t::is_stopping() status should
be ignored.
commit ac8218a0be280ac834904e5579554d9ea3f92aeb
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 31 17:40:42 2017 +0200
fix Ninja builds for AWS SDK
specify BUILD_BYPRODUCTS, ninja needs it
commit 31896aa6e21fd112b929350156b2995b4033506d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 31 15:25:35 2017 +0200
put all aws_key_management plugin files into plugin/aws_key_management
that is, download AWS SDK there, not into the builddir root.
and .gitignore them all.
commit 9de7386f6f029985e65e02a1d98240f6808020aa
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri Mar 31 16:01:37 2017 +0000
AWS KMS plugin : Fix building in case AWS C++ SDK was preinstalled
into non-standard compiler/linker path (e.g vcpkg on Windows).
Also fix linking with static preinstalled aws c++ sdk libraries
commit a00517ac9707ffd51c092f5af5d198c5ee789bb4
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 28 19:34:51 2017 +0200
restore the correct linking of ed25519 plugin
* add a clarifying comment
* apply /wd4244 /wd4146 to ref10 source files, not to the library
commit 9ab9a28b5d9ff7fd175ae64b0d9e3c984dfb0abf
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 27 11:04:06 2017 +0200
disable innodb snappy for release builds
commit c56b896c17f7f4992ef871c51673b059a70795d4
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue Mar 28 12:28:09 2017 +0300
Fix test failure on debug_key_management test.
commit 8bd1f06c5adb748ccab11f75262b7b0f1f5b92d0
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Mar 27 15:51:39 2017 +0200
Return to original version of jdbc.test
commit efe99828739e4e570aeb7e6a370dbef0b1c33605
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon Mar 27 15:40:07 2017 +0200
Fix crash when a line is not ended by \n.
modified: storage/connect/filamap.cpp
Add specifying a password when reading zipped tables.
modified: storage/connect/filamzip.cpp
modified: storage/connect/filamzip.h
modified: storage/connect/tabdos.cpp
modified: storage/connect/tabdos.h
Try Vaintroub suggestion
modified: storage/connect/mysql-test/connect/t/jdbc.test
commit ba298b1f022aa5e1247d07a97325c0a09bdd1dc2
Merge: 716188f1d40 c51fc679f50
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Fri Mar 24 18:20:09 2017 +0200
Merge 10.0 into 10.1
commit 716188f1d407acf8181966396d6c0923716f4546
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri Mar 24 10:02:31 2017 +0100
Fix some warnings on Windows compilation
- silence warnings in ed25519 reference implementation
- fix signed/unsigned warning in popular header item_func.h
commit d7c35a999203c98e772241f1c7858253dd96ac89
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu Mar 23 19:28:36 2017 +0000
Fix compiler error
commit e5b67a46bcb75a751f5906f19694971bc803d67c
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Thu Mar 23 11:48:56 2017 +0000
MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by THD::start_utime
commit 09a2107b1b2f5567b8a50afec9e54a33284c6233
Merge: bbf0c9d4c35 0d622bed4f1
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 21 19:20:44 2017 +0100
Merge branch '10.0' into 10.1
commit bbf0c9d4c35034c8634cd9607712d94fac089127
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 16 09:07:20 2017 +0100
cleanup: pfs_upgrade* tests
commit 386ef08704de7b8070823e5519a530dad259fe11
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 13 10:54:08 2017 +0100
MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64le
verify that tests don't leave mysql_upgrade_info in datadir
commit cf1ca7473604d640ad3f20d1ec89d293b9748c73
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 18 12:42:46 2017 +0100
Typo
commit d9b7433c98e6001b32d4489125a3366c79be14b1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 18 10:40:51 2017 +0100
Fix MDEV-12220: add MODE_READX to permissible index read
modified: storage/connect/connect.cc
commit 932a4401f092f6fac1ad4242cc1923dffa56f9cf
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 17 19:00:30 2017 +0100
Fix MDEV-12220: Crash when doing UPDATE or DELETE on an external
table (ODBC, JDBC, MYSQL) with a WHERE clause on an indexed column.
Also fix a bugs in TDBEXT::MakeCommand (use of uninitialised Quote)
Add in this function the eventual Schema (database) prefixing.
modified: storage/connect/connect.cc
modified: storage/connect/tabext.cpp
commit b1ec35b90303446d2f1a5810455bcafbc091f928
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Thu Mar 16 17:30:13 2017 +0200
Add assertions when key rotation list is used.
commit c333cae652491998c34526ab0b5bfc3ecb2fe474
Author: =Ian Gilfillan <github@greenman.co.za>
Date: Thu Mar 16 13:35:36 2017 +0200
MDEV-11964 Add more stub missing man pages
commit 854359ffc519292470d29ebcbfe9416968b56da0
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue Mar 14 20:44:25 2017 +0000
Fix AWS KMS plugin's compile error
Do not include base64.h, it was recently removed.
commit 50eb40a2a8aa3af6cc271f6028f4d6d74301d030
Author: Jan Lindström <jan.lindstrom@mariadb.com>
Date: Tue Mar 14 12:56:01 2017 +0200
MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing
MDEV-11581: Mariadb starts InnoDB encryption threads
when key has not changed or data scrubbing turned off
Background: Key rotation is based on background threads
(innodb-encryption-threads) periodically going through
all tablespaces on fil_system. For each tablespace
current used key version is compared to max key age
(innodb-encryption-rotate-key-age). This process
naturally takes CPU. Similarly, in same time need for
scrubbing is investigated. Currently, key rotation
is fully supported on Amazon AWS key management plugin
only but InnoDB does not have knowledge what key
management plugin is used.
This patch re-purposes innodb-encryption-rotate-key-age=0
to disable key rotation and background data scrubbing.
All new tables are added to special list for key rotation
and key rotation is based on sending a event to
background encryption threads instead of using periodic
checking (i.e. timeout).
fil0fil.cc: Added functions fil_space_acquire_low()
to acquire a tablespace when it could be dropped concurrently.
This function is used from fil_space_acquire() or
fil_space_acquire_silent() that will not print
any messages if we try to acquire space that does not exist.
fil_space_release() to release a acquired tablespace.
fil_space_next() to iterate tablespaces in fil_system
using fil_space_acquire() and fil_space_release().
Similarly, fil_space_keyrotation_next() to iterate new
list fil_system->rotation_list where new tables.
are added if key rotation is disabled.
Removed unnecessary functions fil_get_first_space_safe()
fil_get_next_space_safe()
fil_node_open_file(): After page 0 is read read also
crypt_info if it is not yet read.
btr_scrub_lock_dict_func()
buf_page_check_corrupt()
buf_page_encrypt_before_write()
buf_merge_or_delete_for_page()
lock_print_info_all_transactions()
row_fts_psort_info_init()
row_truncate_table_for_mysql()
row_drop_table_for_mysql()
Use fil_space_acquire()/release() to access fil_space_t.
buf_page_decrypt_after_read():
Use fil_space_get_crypt_data() because at this point
we might not yet have read page 0.
fil0crypt.cc/fil0fil.h: Lot of changes. Pass fil_space_t* directly
to functions needing it and store fil_space_t* to rotation state.
Use fil_space_acquire()/release() when iterating tablespaces
and removed unnecessary is_closing from fil_crypt_t. Use
fil_space_t::is_stopping() to detect when access to
tablespace should be stopped. Removed unnecessary
fil_space_get_crypt_data().
fil_space_create(): Inform key rotation that there could
be something to do if key rotation is disabled and new
table with encryption enabled is created.
Remove unnecessary functions fil_get_first_space_safe()
and fil_get_next_space_safe(). fil_space_acquire()
and fil_space_release() are used instead. Moved
fil_space_get_crypt_data() and fil_space_set_crypt_data()
to fil0crypt.cc.
fsp_header_init(): Acquire fil_space_t*, write crypt_data
and release space.
check_table_options()
Renamed FIL_SPACE_ENCRYPTION_* TO FIL_ENCRYPTION_*
i_s.cc: Added ROTATING_OR_FLUSHING field to
information_schema.innodb_tablespace_encryption
to show current status of key rotation.
commit a2f34809e55c492af9a23d43840133f01528df7b
Author: Daniel Bartholomew <db@dbart.us>
Date: Tue Mar 14 09:56:05 2017 -0400
bump the VERSION
commit 98be67266dc2f331e64ed5d875154fc6352f262a
Author: Vladislav Vaintroub <wlad@mariadb.com>
Date: Mon Mar 13 23:13:24 2017 +0000
Fix truncation of affected rows and insert id in select_insert::send_ok_packet
commit 9dc10d5851ab4ff38d81e68858de56fbb1d6743d
Merge: 68be011cf2e 032678ad184
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Mon Mar 13 19:17:34 2017 +0200
Merge 10.0 into 10.1
commit 68be011cf2ec96a622db857fe9c418380d106d0d
Author: Elena Stepanova <elenst@montyprogram.com>
Date: Sat Mar 11 20:59:52 2017 +0200
Updated list of unstable tests for 10.1.22
commit 20338443197590beb943e8e1eed17cf95d2a51e0
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sat Mar 11 12:42:55 2017 +0100
test failures in buildbot
commit e5f5457b6fdada826fca23e17b6925e2f9634a03
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Mar 11 14:10:34 2017 +0100
Also order the result of multiple=1 table, otherwise being different
on Linux and Windows causing the test to fail.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit f0ec34002a98eeb669cb254eaba6a3d678a58cc1
Author: iangilfillan <github@greenman.co.za>
Date: Fri Feb 10 13:26:55 2017 +0200
Correct FSF address
commit 2a0ae1c90acc6332606144719764cb5fc730bf3b
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 7 19:21:42 2017 +0100
MDEV-11965 -Werror should not appear in released tarballs
commit 5d40ed864eb91314c894c713cd0d3d03c62ec8c5
Author: Sergei Golubchik <serg@mariadb.org>
Date: Tue Mar 7 19:17:37 2017 +0100
MDEV-11752 Unsafe strmov - function definition in include/m_string.h
assert that strmov() cannot be used on overlapping strings.
(because strpcpy cannot)
commit e0a03ca30aa6f91daf7ea519a57d85e54dc49927
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 01:27:34 2017 +0100
ed25519 plugin: simplify the api
various ed25519/ref10 api simplifications for our specific use case
commit 7120118a5e97477778715ebdc8e4fba548a6dc87
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 16:18:16 2017 +0100
MDEV-12160 Modern alternative to the SHA1 authentication plugin
ED25519 authentication plugin
commit 269ab56f8b4056ec63e712ba305761dd835ea10e
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 22:42:00 2017 +0100
small plugin API related fixes
* define MYSQL_DYNAMIC_PLUGIN only for server plugins
* don't typedef my_bool in mysql.h if plugin.h has already done it
* fix the include guard in plugin.h
commit 227f63db3b0b9a1ce29c37f1c104ba5d204d0392
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 19:37:48 2017 +0100
cleanup: sort various lists of services
commit 0877eff4012ab1184112814a3492d23bf266f848
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 19:34:22 2017 +0100
thd_rnd service
commit 6305533de2fd38d43c149d4d7c847f65d68205c7
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 17:32:18 2017 +0100
Auth Plugin API: add THD to MYSQL_SERVER_AUTH_INFO
so that auth plugins could use various thd services
commit 051851b9a673e38d12612ea92d8a8913b8f0ca45
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 17:05:03 2017 +0100
base64 service
commit 70a2efde0352052fce5a44481055542e0b050048
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 15:31:25 2017 +0100
remove old API for SHA2
commit d6a7aece0826e0c115eb21912527c77596c1305e
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 13:06:03 2017 +0100
my_sha2 service
commit bd1139ad2722cf8717cd1aaac4431f369d39562f
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 12:45:36 2017 +0100
cleanup: generalize my_sha1.cc
move most of the code into my_sha.ic, making it independent
from the actual SHAx variant.
commit 6cddd12ad6eeea82b1087574e5dd5cb9accd7641
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 15:50:32 2017 +0100
make sql_udf.cc to shorten dlerror() messages
just as sql_plugin.cc does
commit 2b1bbac5fa881b8e135dbad3e0ff6b9e2763e24d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sun Mar 5 20:51:31 2017 +0100
cleanup: remove a duplicate file
commit aa51b559abec01eca9f5a7628e4fe0a106ee8e52
Author: Sergei Golubchik <serg@mariadb.org>
Date: Mon Mar 6 15:07:46 2017 +0100
typo fixed
commit 0633d0e2ed606a7fe51d0cbf08c60c5a7d5572f6
Author: Sergei Golubchik <serg@mariadb.org>
Date: Wed Mar 8 14:54:12 2017 +0100
don't show 'performance_schema_%_classes_lost' variables in tests
because FLUSH STATUS does not reset them, so their values
are affected by previously run tests since the last server restart.
commit 3d06f0f72cbabe833036f920e9452cd6ef46e5aa
Author: Sergei Golubchik <serg@mariadb.org>
Date: Sat Mar 4 17:17:00 2017 +0100
MDEV-11942 BLACKHOLE is no longer active in 10.1 by default, mysql_upgrade not handling the situation
fix the patch. add tests
commit c372388e4862938037f98b6e4936bc61872354dd
Author: Hartmut Holzgraefe <hartmut@mariadb.com>
Date: Tue Feb 7 22:56:28 2017 +0100
make mysql_upgrade try to install missing storage engine plugins (MDEV-11942)
commit 8f1ca5e311bda92d4e901aae8ec5c47597d0f934
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 3 15:27:19 2017 +0100
MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engine
Try harder to show the table's engine.
If the table's engine is not loaded, the table won't open.
But we can still read the engine name from frm as a string.
commit 48b1d175345caa3c644597044751906a04106b91
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 15:36:18 2017 +0100
MDEV-11943 I_S.TABLES inconsistencies with tables with unknown storage engine
Make SELECT <columns> FROM I_S.TABLES behave identically independently
from whether <columns> require opening the table in engine or
<columns> can be filled with only opening the frm.
In particular, fill_schema_table_from_frm() should not silently skip
frms with unknown engine, but should fill the I_S.TABLES row
with NULLs just like fill_schema_table_by_open() does.
commit 25c32c89f14cba402a42a61a8a371ce515610899
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 14:04:14 2017 +0100
trivial cleanup
commit 8eb66bc382295003e5da5ff50365d62def30f52d
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 20:59:29 2017 +0100
cleanup: change dd_frm_type() to return the engine name, not legacy_db_type
this simplifies the code and avoids unnecessary conversions back and forth.
and it works even if the engine is not installed.
commit 1c8d2121ab0e9ca0d8a8fccdd85da1072ef30815
Author: Sergei Golubchik <serg@mariadb.org>
Date: Thu Mar 2 06:53:07 2017 +0100
don't do vio_description(NULL)
this fixes the crash of innodb.innodb-blob --ps-protocol
commit 5fa04aae9ec94428a68ef4f6f681564111933c11
Author: Sergei Golubchik <serg@mariadb.org>
Date: Wed Mar 1 23:52:35 2017 +0100
MDEV-11842 Fail to insert on a table where a field has no default
has_no_default_value() should only fail the insert in the strict mode.
Additionally, don't check for "all fields are given values" twice,
it'll produce duplicate warnings.
commit b6a1d6538b4d2001be20fe0d8f470874c744f0a2
Author: Sergei Golubchik <serg@mariadb.org>
Date: Fri Mar 10 16:25:01 2017 +0100
compiler warnings
commit 2d573a6c5a471ec187b9bdc4db6503dad9639650
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 10 17:53:36 2017 +0100
CONNECT Storage Engine: Support of ENUM and SET column types
for MYSQL tables.
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
Order the result of multiple=3 table, otherwise being different
on Linux and Windows causing the test to fail.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit 0094b6581df1530821608327df50b8479e1dc0f8
Merge: 814d0507604 1d47bd61d55
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Fri Mar 10 15:16:13 2017 +0200
Merge 10.0 into 10.1
commit 814d0507604192d1da18eb2e30529e5559ce140e
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
Date: Fri Mar 10 14:07:22 2017 +0200
MDEV-12215: main.repair_symlink-5543 fails in buildbot
If openat is present on the system and it tries to open a symlink with
O_NOFOLLOW, we get errno 40.
If openat is not present on the system, we use the alternative open call, with
slightly different logic. IF the symlink doesn't point to a valid file,
we get errno 20. This test uses an invalid symlink on the table t1.MYD.
commit 18de8296182f42cdf663573949a82950b72af8fc
Author: iangilfillan <github@greenman.co.za>
Date: Thu Mar 9 13:18:40 2017 +0200
MDEV-11964 Add missing stub manpages
commit bf6cadf923d2e7756e037898dd3b9384dd1fc807
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Fri Mar 10 00:28:26 2017 +0100
CONNECT Storage Engine:
The last commited changes have brought important additions to CONNECT.
1 - Replacement of setjmp/longjump's by try/catch/throw
2 - Support of multiple tables in subdirectories
3 - Support translating ENUM to VARCHAR for MYSQL tables.
4 - Tables based on ZIP files
Support ENUM data type for MYSQL tables.
modified: storage/connect/myconn.cpp
modified: storage/connect/myutil.cpp
Fix typo causing the test to fail on Linux.
modified: storage/connect/mysql-test/connect/r/mul_new.result
modified: storage/connect/mysql-test/connect/t/mul_new.test
commit cdc7a69ea2decf1e8f36dbaa12591abaedf05a35
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Mar 9 16:28:11 2017 +0100
CONNECT DIR tables: fix retrieving file date values under Windows.
modified: storage/connect/tabmul.cpp
modified: storage/connect/tabmul.h
commit 07d89fa59c1734b5a963943dcb93ade0c4e92e48
Author: Vicențiu Ciorbaru <vicentiu@mariadb.org>
Date: Thu Mar 9 16:52:57 2017 +0200
Remove leftover merge conflict marker
commit 5aacb861f2e84e1f45d72bf34fdaffa0904a9f5b
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 14:45:52 2017 +0200
WSREP: Use TRX_ID_FMT for trx_id_t in messages.
commit b28adb6a62661b60f80c7c1b6237b74fb7cdcee2
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 15:09:44 2017 +0200
Fix an error introduced in the previous commit.
fil_parse_write_crypt_data(): Correct the comparison operator.
This was broken in commit 498f4a825b29a37cb27f1c76741987de8c510d06
which removed a signed/unsigned mismatch in these comparisons.
commit 498f4a825b29a37cb27f1c76741987de8c510d06
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Thu Mar 9 08:54:07 2017 +0200
Fix InnoDB/XtraDB compilation warnings on 32-bit builds.
commit ad0c218a440575fa6fb6634aca7a08448a4360e0
Merge: bb4ef470c24 9fe92a9770a
Author: Marko Mäkelä <marko.makela@mariadb.com>
Date: Wed Mar 8 19:44:22 2017 +0200
Merge 10.0 into 10.1
Also, implement MDEV-11027 a little differently from 5.5 and 10.0:
recv_apply_hashed_log_recs(): Change the return type back to void
(DB_SUCCESS was always returned).
Report progress also via systemd using sd_notifyf().
commit 95667ae2945a6f8891ed7b49bff8b9fa19d7d1a1
Author: Olivier Bertrand <bertr…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
like 9a218f4
sorry for missing it first time @janlindstrom