diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-01 14:42:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-01 14:42:51 +0300 |
| commit | 50a11f396af81aac6d5f51e8278ec9a7fa17e7c8 (patch) | |
| tree | 1a695f030aa737b200e9271f9403971f8a571849 /plugin | |
| parent | 842da858b6c5b619bb5395ef4216f7e675b0f3a0 (diff) | |
| parent | 9216114ce729733e6b0c4ce952bfdf57595ff387 (diff) | |
| download | mariadb-git-50a11f396af81aac6d5f51e8278ec9a7fa17e7c8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_pam/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/type_inet/sql_type_inet.cc | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt index 28a194927e9..93ac29cd425 100644 --- a/plugin/auth_pam/CMakeLists.txt +++ b/plugin/auth_pam/CMakeLists.txt @@ -25,7 +25,7 @@ IF(HAVE_PAM_APPL_H) FIND_LIBRARY(PAM_LIBRARY pam) # for srpm build-depends detection ADD_DEFINITIONS(-D_GNU_SOURCE) MYSQL_ADD_PLUGIN(auth_pam_v1 auth_pam_v1.c LINK_LIBRARIES pam MODULE_ONLY) - MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam dl MODULE_ONLY) + MYSQL_ADD_PLUGIN(auth_pam auth_pam.c LINK_LIBRARIES pam ${LIBDL} MODULE_ONLY) IF (TARGET auth_pam) MYSQL_ADD_EXECUTABLE(auth_pam_tool auth_pam_tool.c DESTINATION ${INSTALL_PLUGINDIR}/auth_pam_tool_dir COMPONENT Server) TARGET_LINK_LIBRARIES(auth_pam_tool pam) diff --git a/plugin/type_inet/sql_type_inet.cc b/plugin/type_inet/sql_type_inet.cc index 76334ad1615..14d854be14f 100644 --- a/plugin/type_inet/sql_type_inet.cc +++ b/plugin/type_inet/sql_type_inet.cc @@ -622,10 +622,15 @@ class Field_inet6: public Field Sql_condition::enum_warning_level level) { static const Name type_name= type_handler_inet6.name(); - if (get_thd()->count_cuted_fields > CHECK_FIELD_EXPRESSION) - get_thd()->push_warning_truncated_value_for_field(level, type_name.ptr(), - str.ptr(), table->s, - field_name.str); + if (get_thd()->count_cuted_fields <= CHECK_FIELD_EXPRESSION) + return; + const TABLE_SHARE *s= table->s; + get_thd()->push_warning_truncated_value_for_field(level, type_name.ptr(), + str.ptr(), + s ? s->db.str : nullptr, + s ? s->table_name.str + : nullptr, + field_name.str); } int set_null_with_warn(const ErrConv &str) { |