summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* new trials with custom actions in win installerMDEV-19781Rasmus Johansson2019-08-153-40/+192
|
* MDEV-19781 Create MariaDB named commands on WindowsRasmus Johansson2019-08-127-5/+147
|
* MDEV-19301 Assertion `!is_valid_datetime() || ↵Alexander Barkov2019-08-063-1/+28
| | | | fraction_remainder(((item->decimals) < (6) ? (item->decimals) : (6))) == 0' failed in Datetime_truncation_not_needed::Datetime_truncation_not_needed
* MDEV-19166 Assertion `!is_zero_datetime()' failed in ↵Alexander Barkov2019-08-055-10/+39
| | | | Timestamp_or_zero_datetime::tv
* MDEV-20246 Error compiling PAM plugin.Alexey Botchkov2019-08-031-1/+1
| | | | Ignore the setreuid() return here.
* MDEV-20224: main.derived crashes with ASAN with error use-after-poisonVarun Gupta2019-08-011-0/+1
| | | | | Make sure that the references in the GROUP BY clause that need to be considered for pushdown from having to where are of Item_field objects
* MDEV-20179 Server hangs on shutdown during installation of Spider (#1369)Kentoku SHIBA2019-08-013-70/+54
| | | | Use LOCK_server_started, COND_server_started and mysqld_server_started for waiting starting the server
* bump the VERSIONDaniel Bartholomew2019-07-311-1/+1
|
* List of unstable tests for 10.4.7 release (updated)mariadb-10.4.7Elena Stepanova2019-07-301-41/+71
|
* MDEV-20179 Server hangs on shutdown during installation of Spider (#1368)Kentoku SHIBA2019-07-303-11/+23
|
* MDEV-20179 Server hangs on shutdown during installation of Spider (#1367)Kentoku SHIBA2019-07-301-0/+4
|
* MDEV-20200: AddressSanitizer: use-after-poison in ↵Oleksandr Byelkin2019-07-293-18/+51
| | | | | | Item_direct_view_ref::get_null_ref_table Do not cast wrong type.
* MDEV-20179 Server hangs on shutdown during installation of Spider (#1366)Kentoku SHIBA2019-07-291-6/+13
|
* Fix for MW-336 testJulius Goryavsky2019-07-291-4/+4
|
* Do not compile socket IO code in WolfSSLVladislav Vaintroub2019-07-282-0/+5
| | | | We use own IO callbacks from server code anyway.
* Update WolfSSL, remove older workarounds.Vladislav Vaintroub2019-07-286-51/+7
|
* Merge branch '10.3' into 10.4Oleksandr Byelkin2019-07-28128-217/+3654
|\
| * List of unstable tests for 10.3.17 release (updated)mariadb-10.3.17Elena Stepanova2019-07-281-16/+37
| |
| * Fix Windows packaging.Vladislav Vaintroub2019-07-271-2/+2
| |
| * Changes of merge moved to oracle mode parser.Oleksandr Byelkin2019-07-271-18/+20
| |
| * Fix initialiser.Oleksandr Byelkin2019-07-261-1/+2
| |
| * Merge branch '10.2' into 10.3Oleksandr Byelkin2019-07-26124-154/+3603
| |\
| | * Merge branch '10.1' into 10.2Oleksandr Byelkin2019-07-2661-50/+385
| | |\
| | | * Merge branch '5.5' into 10.1Oleksandr Byelkin2019-07-264-9/+17
| | | |\
| | | | * Move the test not suitable for embedded.Oleksandr Byelkin2019-07-264-9/+13
| | | | |
| | | * | Merge branch 'merge-tokudb-5.6' into 10.1Oleksandr Byelkin2019-07-2654-28/+346
| | | |\ \
| | | | * | 5.6.44-86.0Oleksandr Byelkin2019-07-2654-23/+347
| | | | | |
| | | * | | Merge remote-tracking branch 'connect/10.1' into 10.1Oleksandr Byelkin2019-07-269-124/+82
| | | |\ \ \
| | | | * \ \ Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-03-2615-165/+212
| | | | |\ \ \
| | | | | * | | Fixed compiler warning in connect engineOlivier Bertrand2019-03-251-1/+1
| | | | | | | |
| | | | | * | | - Fix MDEV-15793: Server crash in PlugCloseFile with sql_mode=''Olivier Bertrand2019-03-2514-164/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by replacing sprinf by snprintf in ShowValue to avoid buffer overflow. It nows always use a buffer and returns int. modified: storage/connect/tabdos.cpp modified: storage/connect/tabfmt.cpp modified: storage/connect/value.cpp modified: storage/connect/value.h
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-01-275-44/+100
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Fix MDEV-18192: CONNECT Engine JDBC not able to issueOlivier Bertrand2019-01-275-44/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simple UPDATE statement from trigger or stored procedure modified: storage/connect/tabext.cpp modified: storage/connect/tabext.h modified: storage/connect/tabjdbc.cpp - Enable CONNECT tables to have triggers Update version number modified: storage/connect/ha_connect.cc - Make user and password defined in CREATE TABLE have precedence on the ones specified in a Federated Server. modified: storage/connect/tabjdbc.cpp - JSONColumns: Copy locally constant strings to fix error in OEM modules modified: storage/connect/tabjson.cpp
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2019-01-046-145/+185
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Fix a few bug mainly concerning discovery and call from OEMOlivier Bertrand2019-01-036-145/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (and prepare new table types) modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h - Fix wrong line estimate modified: storage/connect/mysql-test/connect/r/part_table.result modified: storage/connect/mysql-test/connect/t/part_table.test
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-12-041-1/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Fix wrong version numberOlivier Bertrand2018-12-041-1/+1
| | | | | | | |
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-12-0213-203/+231
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Make PlugSubAlloc to be exportableOlivier Bertrand2018-12-0113-203/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress unused parameter from PlugSubSet modified: storage/connect/global.h modified: storage/connect/plugutil.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/user_connect.cc - Fix a bug making column catalog XML tables fail modified: storage/connect/tabxml.cpp - Comment out wrong message modified: storage/connect/ha_connect.cc - Update error message when sorting an ODBC table fails modified: storage/connect/tabodbc.cpp - Add error message when gettting an address from an OEM fails. modified: storage/connect/reldef.cpp - Make some modifications useful for OEM module writting Export discovery functions for CSV, JDBC and XML Remove unuseful include from tabjson.h Move TDBXML::data_charset function from header file to source modified: storage/connect/tabfmt.h modified: storage/connect/tabjson.h modified: storage/connect/tabxml.cpp modified: storage/connect/tabxml.h - Update test result modified: storage/connect/mysql-test/connect/r/jdbc_oracle.result
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-10-1116-55/+154
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Implement the CHECK TABLE statement and accept REPAIR and ANALYZEOlivier Bertrand2018-10-1116-55/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/connect.cc modified: storage/connect/ha_connect.cc modified: storage/connect/ha_connect.h modified: storage/connect/tabjdbc.cpp modified: storage/connect/tabmysql.cpp modified: storage/connect/tabodbc.cpp - MDEV-17212: Test if NumResultCols is implemented by the data source modified: storage/connect/odbconn.cpp - Change error type in Optimize modified: storage/connect/ha_connect.cc - Update version date modified: storage/connect/ha_connect.cc - Fix truncating error messages on first unrecognized latin1 character modified: storage/connect/ha_connect.cc - Fix MDEV-17343 Reject multi-table UPDATE/DELETE commands that crash on some systems modified: storage/connect/ha_connect.cc modified: storage/connect/tabext.cpp - Try fix some failing tests modified: storage/connect/mysql-test/connect/disabled.def modified: storage/connect/mysql-test/connect/r/vcol.result modified: storage/connect/mysql-test/connect/t/vcol.test modified: storage/connect/mysql-test/connect/r/jdbc.result modified: storage/connect/mysql-test/connect/r/jdbc_postgresql.result modified: storage/connect/mysql-test/connect/r/mysql_exec.result modified: storage/connect/mysql-test/connect/r/odbc_postgresql.result - Typo modified: storage/connect/global.h
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-08-0822-221/+162
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Comment out failing Cyrillic test in xml2.testOlivier Bertrand2018-08-082-49/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/mysql-test/connect/r/xml2.result modified: storage/connect/mysql-test/connect/t/xml2.test
| | | | | * | | - Fix MDEV-16672 Connect: Warnings with 10.0Olivier Bertrand2018-08-0720-172/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filamtxt.cpp: DOSFAM::RenameTempFile: Change sprintf to snprintf. filamvct.cpp: VECFAM::RenameTempFile: Change sprintf to snprintf. javaconn.cpp: Add JAVAConn::GetUTFString function. Use it instead of env->GetStringUTFChars. Fix wrong identation. javaconn.h: Add GetUTFString declaration. jdbconn.cpp: Use GetUTFString function instead of env->GetStringUTFChars. jmgoconn.cpp: Use GetUTFString function instead of env->GetStringUTFChars. Fix wrong identation. jsonudf.cpp: change 139 to BMX line 4631. tabjmg.cpp: Add ReleaseStringUTF. Fix wrong identation. tabpivot.cpp: Fix wrong identation. tabutil.cpp: TDBPRX::GetSubTable: Change sprintf to snprintf. modified: storage/connect/filamtxt.cpp modified: storage/connect/filamvct.cpp modified: storage/connect/javaconn.cpp modified: storage/connect/javaconn.h modified: storage/connect/jdbconn.cpp modified: storage/connect/jmgoconn.cpp modified: storage/connect/jsonudf.cpp modified: storage/connect/tabjmg.cpp modified: storage/connect/tabpivot.cpp modified: storage/connect/tabutil.cpp - Fix MDEV-16895 CONNECT engine's get_error_message can cause buffer overflow and server crash with long queries ha_connect_cc: Update version. get_error_message: Remove charset conversion. modified: storage/connect/ha_connect.cc - Fix a server crash on inserting bigint to a JDBC table JDBConn::SetUUID: Suppress check on ctyp that causes a server crash because ctyp can be negative and this triggers an DEBUG_ASSERT on return. modified: storage/connect/jdbconn.cpp - Delete an assert(qrp) from JCATPARM *AllocCatInfo that is called with qrp=NULL from JDBConn::SetUUID. Also delete a clone of this function that was duplicated in javaconn.cpp. modified: storage/connect/javaconn.cpp modified: storage/connect/jdbconn.cpp - Update some disabled tests and results to avoid failure modified: storage/connect/mysql-test/connect/r/jdbc.result 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/mongo_java_2.result modified: storage/connect/mysql-test/connect/r/mongo_java_3.result modified: storage/connect/mysql-test/connect/t/json_java_2.test modified: storage/connect/mysql-test/connect/t/json_java_3.test modified: storage/connect/mysql-test/connect/t/mongo_java_2.test modified: storage/connect/mysql-test/connect/t/mongo_java_3.test
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-06-282-12/+16
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Fix MDEV-16167 Cannot insert unsigned values into a VEC tableOlivier Bertrand2018-06-282-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/filamvct.cpp modified: storage/connect/tabvct.cpp
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-05-0710-45/+33
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious conditionOlivier Bertrand2018-05-0710-45/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modified: storage/connect/filamtxt.cpp - Fix compiler warnings modified: storage/connect/domdoc.cpp modified: storage/connect/ha_connect.cc modified: storage/connect/json.h modified: storage/connect/jsonudf.cpp modified: storage/connect/tabext.cpp modified: storage/connect/tabjson.cpp modified: storage/connect/tabjson.h - Miscelleanous from 10.3 modified: storage/connect/ha_connect.cc modified: storage/connect/mycat.cc modified: storage/connect/user_connect.cc
| | | | * | | | Merge branch 'ob-10.1' into 10.1Olivier Bertrand2018-03-271-1/+1
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | - Fix MDEV-15577 CONNECT engine JDBC remote index prevents UPDATEOlivier Bertrand2018-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed in TDBJDBC::OpenDB because query can be null for updates modified: storage/connect/tabjdbc.cpp