Commit 0e593c12 authored by Sergey Petrunya's avatar Sergey Petrunya

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.
parent 0a20d762
...@@ -5054,7 +5054,7 @@ int THD::decide_logging_format(TABLE_LIST *tables) ...@@ -5054,7 +5054,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx", DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx",
table->table_name, flags)); 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. The statement uses a table that is not replicated.
......
...@@ -315,8 +315,6 @@ TABLE_SHARE *alloc_table_share(const char *db, const char *table_name, ...@@ -315,8 +315,6 @@ TABLE_SHARE *alloc_table_share(const char *db, const char *table_name,
strmov(share->path.str, path); strmov(share->path.str, path);
share->normalized_path.str= share->path.str; share->normalized_path.str= share->path.str;
share->normalized_path.length= path_length; 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->table_category= get_table_category(& share->db, & share->table_name);
share->open_errno= ENOENT; share->open_errno= ENOENT;
share->cached_row_logging_check= -1; share->cached_row_logging_check= -1;
......
...@@ -660,8 +660,6 @@ struct TABLE_SHARE ...@@ -660,8 +660,6 @@ struct TABLE_SHARE
LEX_STRING normalized_path; /* unpack_filename(path) */ LEX_STRING normalized_path; /* unpack_filename(path) */
LEX_STRING connect_string; LEX_STRING connect_string;
bool is_gtid_slave_pos;
/* /*
Set of keys in use, implemented as a Bitmap. Set of keys in use, implemented as a Bitmap.
Excludes keys disabled by ALTER TABLE ... DISABLE KEYS. Excludes keys disabled by ALTER TABLE ... DISABLE KEYS.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment