diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2018-05-07 22:43:43 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-28 10:41:31 +0100 |
commit | 70e567f576319fc98ff76552fe2e688aeb46fa2c (patch) | |
tree | 4fadc7a2f80d6dece39dd0e0a83ebfe0a48654b6 /storage/connect/user_connect.cc | |
parent | 411a2540ee043a6805555387df1b26b48b483eef (diff) | |
download | mariadb-git-70e567f576319fc98ff76552fe2e688aeb46fa2c.tar.gz |
Squashed commit of connect/10.0:
commit 02d8c21380f
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sat Oct 6 16:27:13 2018 +0200
- 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 to fix failing tests (MariaDB version 10.0 only)
modified: storage/connect/mysql-test/connect/disabled.def
- Typo
modified: storage/connect/global.h
commit f83caed8569
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Sep 25 15:49:26 2018 +0200
- Try to fix failing tests (MariaDB version 10.0 only)
modified: storage/connect/mysql-test/connect/disabled.def
modified: storage/connect/mysql-test/connect/r/grant2.result
modified: storage/connect/mysql-test/connect/r/infoschema2-9739.result
modified: storage/connect/mysql-test/connect/r/mysql_exec.result
commit 9fd6f178846
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Sun Sep 23 19:45:59 2018 +0200
- Implement the CHECK TABLE statement and accept REPAIR and ANALYZE
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
- Record new result from odbc_postgresql.test
modified: storage/connect/mysql-test/connect/r/odbc_postgresql.result
commit d8cf51319e1
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Wed Aug 8 12:18:52 2018 +0200
- Comment out failing Cyrillic test in xml2.test
modified: storage/connect/mysql-test/connect/r/xml2.result
modified: storage/connect/mysql-test/connect/t/xml2.test
commit 9df49e21f9e
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Tue Aug 7 15:01:06 2018 +0200
- Fix MDEV-16672 Connect: Warnings with 10.0
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
commit 415273eb193
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Thu Jun 28 19:37:49 2018 +0200
- Fix MDEV-16167 Cannot insert unsigned values into a VEC table
modified: storage/connect/filamvct.cpp
modified: storage/connect/tabvct.cpp
commit 9ffcb68a9f2
Author: Olivier Bertrand <bertrandop@gmail.com>
Date: Mon May 7 22:43:43 2018 +0200
- Fix MDEV-15735 CONNECT [filamtxt.cpp:429]: Suspicious condition
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
Diffstat (limited to 'storage/connect/user_connect.cc')
-rw-r--r-- | storage/connect/user_connect.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/connect/user_connect.cc b/storage/connect/user_connect.cc index 9532d7c2a8d..e2d3b664aeb 100644 --- a/storage/connect/user_connect.cc +++ b/storage/connect/user_connect.cc @@ -36,6 +36,7 @@ #define DONT_DEFINE_VOID #define MYSQL_SERVER +#include <my_global.h> #include "sql_class.h" #undef OFFSET |