Kouhei Sutou
null+****@clear*****
Sun Jul 29 22:26:49 JST 2018
Kouhei Sutou 2018-07-29 22:26:49 +0900 (Sun, 29 Jul 2018) New Revision: cae06c25ce94d2b5e287f6b3f50ad39b3dd363ff https://github.com/mroonga/mroonga/commit/cae06c25ce94d2b5e287f6b3f50ad39b3dd363ff Message: mysql8: stop _id update check on UPDATE with full binlog row image Modified files: ha_mroonga.cpp mrn_mysql_compat.h Modified: ha_mroonga.cpp (+6 -0) =================================================================== --- ha_mroonga.cpp 2018-07-29 18:44:11 +0900 (c0598d7c) +++ ha_mroonga.cpp 2018-07-29 22:26:49 +0900 (355e7ad5) @@ -7218,6 +7218,12 @@ int ha_mroonga::storage_update_row(const uchar *old_data, if (field->is_null()) continue; +#ifdef MRN_THD_VARIABLES_HAVE_BINLOG_ROW_IMAGE + if (thd->variables.binlog_row_image != BINLOG_ROW_IMAGE_FULL) { + continue; + } +#endif + { mrn::ColumnName column_name(FIELD_NAME(field)); if (strcmp(MRN_COLUMN_NAME_ID, column_name.c_str()) == 0) { Modified: mrn_mysql_compat.h (+4 -0) =================================================================== --- mrn_mysql_compat.h 2018-07-29 18:44:11 +0900 (4bbb28bc) +++ mrn_mysql_compat.h 2018-07-29 22:26:49 +0900 (dbef3eb1) @@ -168,6 +168,10 @@ typedef MYSQL_LEX_STRING mrn_thd_lex_string; #endif +#if MYSQL_VERSION_ID >= 50600 +# define MRN_THD_VARIABLES_HAVE_BINLOG_ROW_IMAGE +#endif + #if defined(MRN_MARIADB_P) && MYSQL_VERSION_ID >= 100306 # define mrn_init_alloc_root(root, name, block_size, pre_alloc_size, flags) \ init_alloc_root(root, name, block_size, pre_alloc_size, flags) -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20180729/4b8bd374/attachment.htm
