[Commits] Rev 3813: Automatic merge in file:///data0/psergey/dev2/10.0-serg-test/

Sergey Petrunya psergey at askmonty.org
Fri Aug 2 17:14:36 EEST 2013


At file:///data0/psergey/dev2/10.0-serg-test/

------------------------------------------------------------
revno: 3813 [merge]
revision-id: psergey at askmonty.org-20130802141435-18yhc3i155ct11de
parent: svoj at mariadb.org-20130802155226-mmbl50jyk1fg1spg
parent: psergey at askmonty.org-20130802141209-4dqfvx2db8acxwbl
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 10.0-serg-test
timestamp: Fri 2013-08-02 18:14:35 +0400
message:
  Automatic merge
modified:
  sql/rpl_gtid.cc                rpl_gtid.cc-20130311150149-fdfrsqq5pjr5r71h-1
  sql/sql_class.cc               sp1f-sql_class.cc-19700101030959-rpotnweaff2pikkozh3butrf7mv3oero
  sql/table.cc                   sp1f-table.cc-19700101030959-nsxtem2adyqzwe6nz4cgrpcmts3o54v7
  sql/table.h                    sp1f-table.h-19700101030959-dv72bajftxj5fbdjuajquappanuv2ija
=== modified file 'sql/rpl_gtid.cc'
--- a/sql/rpl_gtid.cc	2013-06-21 09:53:46 +0000
+++ b/sql/rpl_gtid.cc	2013-08-02 14:12:09 +0000
@@ -210,6 +210,7 @@ rpl_slave_state::truncate_state_table(TH
   {
     table= tlist.table;
     table->no_replicate= 1;
+    table->s->is_gtid_slave_pos= TRUE; // TEMPORARY CODE
     err= table->file->ha_truncate();
 
     if (err)
@@ -346,6 +347,7 @@ rpl_slave_state::record_gtid(THD *thd, c
     goto end;
 
   table->no_replicate= 1;
+  table->s->is_gtid_slave_pos= TRUE; // TEMPORARY CODE
   if (!in_transaction)
     thd->variables.option_bits&=
       ~(ulonglong)(OPTION_NOT_AUTOCOMMIT|OPTION_BEGIN);

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2013-07-24 10:43:57 +0000
+++ b/sql/sql_class.cc	2013-08-02 14:12:09 +0000
@@ -5001,7 +5001,7 @@ int THD::decide_logging_format(TABLE_LIS
       DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx",
                           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.

=== modified file 'sql/table.cc'
--- a/sql/table.cc	2013-07-21 14:43:42 +0000
+++ b/sql/table.cc	2013-08-02 14:12:09 +0000
@@ -315,6 +315,8 @@ TABLE_SHARE *alloc_table_share(const cha
     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->set_refresh_version();
     share->open_errno= ENOENT;

=== modified file 'sql/table.h'
--- a/sql/table.h	2013-07-21 14:39:19 +0000
+++ b/sql/table.h	2013-08-02 14:12:09 +0000
@@ -644,6 +644,8 @@ 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.



More information about the commits mailing list