database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-4816: rpl.rpl_trunc_temp fails in 10.0-serg

Browse Source 
Undo the previous band-aid fix in psergey@askmonty.org-20130802141209-4dqfvx2db8acxwbl.
Kristian has made a proper fix, which uses a different approach.
This commit is contained in:
Sergey Petrunya
2014-01-20 16:36:57 +04:00
parent 0a20d762af
commit 0e593c123f
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@@ -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.

2
sql/table.cc
View File

@@ -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;

2
sql/table.h
View File

@@ -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.