diff options
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 82a56510736..be652e6dd01 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -2187,7 +2187,7 @@ public: int is_current_stmt_binlog_format_row() const { DBUG_ASSERT(current_stmt_binlog_format == BINLOG_FORMAT_STMT || current_stmt_binlog_format == BINLOG_FORMAT_ROW); - return WSREP_FORMAT(current_stmt_binlog_format) == BINLOG_FORMAT_ROW; + return current_stmt_binlog_format == BINLOG_FORMAT_ROW; } enum binlog_filter_state @@ -4572,8 +4572,6 @@ public: uint group_parts,group_length,group_null_parts; uint quick_group; bool using_indirect_summary_function; - /* If >0 convert all blob fields to varchar(convert_blob_length) */ - uint convert_blob_length; CHARSET_INFO *table_charset; bool schema_table; /* TRUE if the temp table is created for subquery materialization. */ @@ -4602,7 +4600,7 @@ public: TMP_TABLE_PARAM() :copy_field(0), group_parts(0), - group_length(0), group_null_parts(0), convert_blob_length(0), + group_length(0), group_null_parts(0), schema_table(0), materialized_subquery(0), force_not_null_cols(0), precomputed_group_by(0), force_copy_fields(0), bit_fields_as_long(0), skip_create_table(0) |