From 0e593c123fd27766917ac62667eac6dc9fc5deca Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Mon, 20 Jan 2014 16:36:57 +0400 Subject: [PATCH] MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-serg Undo the previous band-aid fix in psergey@askmonty.org-20130802141209-4dqfvx2db8acxwbl. Kristian has made a proper fix, which uses a different approach. --- sql/sql_class.cc | 2 +- sql/table.cc | 2 -- sql/table.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d1c3bc25210..541318c93a8 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -5054,7 +5054,7 @@ int THD::decide_logging_format(TABLE_LIST *tables) DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx", table->table_name, flags)); - if (table->table->no_replicate && !table->table->s->is_gtid_slave_pos) + if (table->table->no_replicate) { /* The statement uses a table that is not replicated. diff --git a/sql/table.cc b/sql/table.cc index ecab578d97d..08a12b91a7a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -315,8 +315,6 @@ TABLE_SHARE *alloc_table_share(const char *db, const char *table_name, strmov(share->path.str, path); share->normalized_path.str= share->path.str; share->normalized_path.length= path_length; - /* TEMPORARY FIX: if true, this means this is mysql.gtid_slave_pos table */ - share->is_gtid_slave_pos= FALSE; share->table_category= get_table_category(& share->db, & share->table_name); share->open_errno= ENOENT; share->cached_row_logging_check= -1; diff --git a/sql/table.h b/sql/table.h index c25e2c8a83a..6d8be8f948a 100644 --- a/sql/table.h +++ b/sql/table.h @@ -660,8 +660,6 @@ struct TABLE_SHARE LEX_STRING normalized_path; /* unpack_filename(path) */ LEX_STRING connect_string; - bool is_gtid_slave_pos; - /* Set of keys in use, implemented as a Bitmap. Excludes keys disabled by ALTER TABLE ... DISABLE KEYS.