1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge

Browse Source
This commit is contained in:
Sergey Petrunya 2013-08-02 18:14:35 +04:00
commit cb5de276a3
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/rpl_gtid.cc
View File

@ -210,6 +210,7 @@ rpl_slave_state::truncate_state_table(THD *thd)
{ {
table= tlist.table; table= tlist.table;
table->no_replicate= 1; table->no_replicate= 1;
table->s->is_gtid_slave_pos= TRUE; // TEMPORARY CODE
err= table->file->ha_truncate(); err= table->file->ha_truncate();
if (err) if (err)
@ -346,6 +347,7 @@ rpl_slave_state::record_gtid(THD *thd, const rpl_gtid *gtid, uint64 sub_id,
goto end; goto end;
table->no_replicate= 1; table->no_replicate= 1;
table->s->is_gtid_slave_pos= TRUE; // TEMPORARY CODE
if (!in_transaction) if (!in_transaction)
thd->variables.option_bits&= thd->variables.option_bits&=
~(ulonglong)(OPTION_NOT_AUTOCOMMIT|OPTION_BEGIN); ~(ulonglong)(OPTION_NOT_AUTOCOMMIT|OPTION_BEGIN);

2
sql/sql_class.cc
View File

@ -5001,7 +5001,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) if (table->table->no_replicate && !table->table->s->is_gtid_slave_pos)
{ {
/* /*
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,6 +315,8 @@ 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->set_refresh_version(); share->set_refresh_version();
share->open_errno= ENOENT; share->open_errno= ENOENT;

2
sql/table.h
View File

@ -644,6 +644,8 @@ 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.