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

Bug #20439913 CREATE TABLE DB.TABLE LIKE TMPTABLE IS

Browse Source 
BINLOGGED INCORRECTLY - BREAKS A SLAVE

Submitted a incomplete patch with my previous push,
re submitting the extra changes the required to make
the patch complete.
This commit is contained in:
Venkatesh Duggirala 2015-03-13 13:13:48 +05:30
parent 151b8ec4d1
commit 59142d9a27
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
View File

@ -184,6 +184,8 @@ INSERT INTO t2 VALUES ("DROP USER test_3@localhost with table locked");
UNLOCK TABLE; UNLOCK TABLE;
CREATE DATABASE db; CREATE DATABASE db;
CREATE TABLE db.t1 LIKE t2; CREATE TABLE db.t1 LIKE t2;
CREATE TABLE t3 LIKE t2;
DROP TABLE t3;
DROP DATABASE db; DROP DATABASE db;
DROP USER test_3@localhost; DROP USER test_3@localhost;
DROP FUNCTION f2; DROP FUNCTION f2;

2
mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
View File

@ -155,6 +155,8 @@ UNLOCK TABLE;
# BINLOGGED INCORRECTLY - BREAKS A SLAVE # BINLOGGED INCORRECTLY - BREAKS A SLAVE
CREATE DATABASE db; CREATE DATABASE db;
CREATE TABLE db.t1 LIKE t2; CREATE TABLE db.t1 LIKE t2;
CREATE TABLE t3 LIKE t2;
DROP TABLE t3;
DROP DATABASE db; DROP DATABASE db;
# end of Bug #20439913 test # end of Bug #20439913 test

7
sql/sql_show.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. /* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -1139,6 +1139,11 @@ static bool get_field_default_value(THD *thd, Field *timestamp_field,
to tailor the format of the statement. Can be to tailor the format of the statement. Can be
NULL, in which case only SQL_MODE is considered NULL, in which case only SQL_MODE is considered
when building the statement. when building the statement.
show_database If true, then print the database before the table
name. The database name is only printed in the event
that it is different from the current database.
If false, then do not print the database before
the table name.
NOTE NOTE
Currently always return 0, but might return error code in the Currently always return 0, but might return error code in the

3
sql/sql_table.cc
View File

@ -4720,8 +4720,7 @@ bool mysql_create_like_table(THD* thd, TABLE_LIST* table, TABLE_LIST* src_table,
int result __attribute__((unused))= int result __attribute__((unused))=
store_create_info(thd, table, &query, store_create_info(thd, table, &query,
create_info, create_info, TRUE /* show_database */);
table->db ? TRUE : FALSE/* show_database */);
DBUG_ASSERT(result == 0); // store_create_info() always return 0 DBUG_ASSERT(result == 0); // store_create_info() always return 0
if (write_bin_log(thd, TRUE, query.ptr(), query.length())) if (write_bin_log(thd, TRUE, query.ptr(), query.length()))