Commit 339deb0c authored by unknown's avatar unknown
Browse files

Fix for BUG#20522 "RBR: CREATE TEMPORARY TABLE SELECT writes to binlog 

though unneeded". It's indeed unneeded, as slave is only interested in
permanent tables, and permanent tables don't depend on temporary tables
when in row-based binlogging mode. And other CREATE TEMPORARY TABLE
(referring no table or with LIKE) already don't write the CREATE to
binlog in row-based mode. 


mysql-test/r/rpl_row_create_table.result:
  result update (note that no lines appear in SHOW BINLOG EVENTS further below, which is how we
  see the bug is fixed)
mysql-test/t/rpl_row_create_table.test:
  testing if a CREATE TEMPORARY TABLE SELECT goes to binlog (it should not)
  when in row-based binlogging mode. A few lines after, there is a SHOW
  BINLOG EVENTS; before the bugfix it showed the CREATE TEMPORARY TABLE.
sql/sql_class.h:
  a method to access select_create::create_info from outside of select_create
  ("read-only" access). Making get_thd() "read-only" too.
sql/sql_insert.cc:
  The function (hook) which writes CREATE TABLE to binlog when in row-based
  binlogging mode, for CREATE TABLE SELECT, now does nothing if the table
  is temporary (as in row-based mode, temp tables are not replicated).
  This is consistent with CREATE TEMPORARY TABLE LIKE and
  CREATE TEMPORARY TABLE, which don't write any CREATE to binlog in row-based
  mode.
parent 198b8744

mysql-test/r/rpl_row_create_table.result

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ CREATE TABLE t8 LIKE t4; 
CREATE TABLE t9 LIKE tt4;

CREATE TEMPORARY TABLE tt5 LIKE t4;

CREATE TEMPORARY TABLE tt6 LIKE tt4;

CREATE TEMPORARY TABLE tt7 SELECT 1;

**** On Master ****

SHOW CREATE TABLE t8;

Table	t8

mysql-test/t/rpl_row_create_table.test

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ CREATE TABLE t8 LIKE t4; 
CREATE TABLE t9 LIKE tt4;

CREATE TEMPORARY TABLE tt5 LIKE t4;

CREATE TEMPORARY TABLE tt6 LIKE tt4;

CREATE TEMPORARY TABLE tt7 SELECT 1;

--echo **** On Master ****

--query_vertical SHOW CREATE TABLE t8

--query_vertical SHOW CREATE TABLE t9

sql/sql_class.h

+2 −1
Original line number Diff line number Diff line
@@ -1610,7 +1610,8 @@ class select_create: public select_insert { 
  virtual bool can_rollback_data() { return 1; }



  // Needed for access from local class MY_HOOKS in prepare(), since thd is proteted.

  THD *get_thd(void) { return thd; }

  const THD *get_thd(void) { return thd; }

  const HA_CREATE_INFO *get_create_info() { return create_info; };

};



#include <myisam.h>

sql/sql_insert.cc

+2 −1
Original line number Diff line number Diff line
@@ -2714,7 +2714,8 @@ class MY_HOOKS : public TABLEOP_HOOKS 
  MY_HOOKS(select_create *x) : ptr(x) { }

  virtual void do_prelock(TABLE **tables, uint count)

  {

    if (ptr->get_thd()->current_stmt_binlog_row_based)

    if (ptr->get_thd()->current_stmt_binlog_row_based  &&

        !(ptr->get_create_info()->options & HA_LEX_CREATE_TMP_TABLE))

      ptr->binlog_show_create_table(tables, count);

  }