mirror of
https://github.com/MariaDB/server.git
synced 2025-05-07 04:01:59 +03:00
7ffc9da093
Using CREATE OR REPLACE TABLE is be identical to DROP TABLE IF EXISTS table_name; CREATE TABLE ...; Except that: * CREATE OR REPLACE is be atomic (now one can create the same table between drop and create). * Temporary tables will not shadow the table name for the DROP as the CREATE TABLE tells us already if we are using a temporary table or not. * If the table was locked with LOCK TABLES, the new table will be locked with the same lock after it's created. Implementation details: - We don't anymore open the to-be-created table during CREATE TABLE, which the original code did. - There is no need to open a table we are planning to create. It's enough to check if the table exists or not. - Removed some of duplicated code for CREATE IF NOT EXISTS. - Give an error when using CREATE OR REPLACE with IF NOT EXISTS (conflicting options). - As a side effect of the code changes, we don't anymore have to internally re-prepare prepared statements with CREATE TABLE if the table exists. - Made one code path for all testing if log table are in use. - Better error message if one tries to create/drop/alter a log table in use - Added back disabled rpl_row_create_table test as it now seams to work and includes a lot of interesting tests. - Added HA_LEX_CREATE_REPLACE to mark if we are using CREATE OR REPLACE - Aligned CREATE OR REPLACE parsing code in sql_yacc.yy for TABLE and VIEW - Changed interface for drop_temporary_table() to make it more reusable - Changed Locked_tables_list::init_locked_tables() to work on the table object instead of the table list object. Before this it used a mix of both, which was not good. - Locked_tables_list::unlock_locked_tables(THD *thd) now requires a valid thd argument. Old usage of calling this with 0 i changed to instead call Locked_tables_list::reset() - Added functions Locked_tables_list:restore_lock() and Locked_tables_list::add_back_last_deleted_lock() to be able to easily add back a locked table to the lock list. - Added restart_trans_for_tables() to be able to restart a transaction. - DROP_ACL is required if one uses CREATE TABLE OR REPLACE. - Added drop of normal and temporary tables in create_table_imp() if CREATE OR REPLACE was used. - Added reacquiring of table locks in mysql_create_table() and mysql_create_like_table() mysql-test/include/commit.inc: With new code we get fewer status increments mysql-test/r/commit_1innodb.result: With new code we get fewer status increments mysql-test/r/create.result: Added testing of create or replace with timeout mysql-test/r/create_or_replace.result: Basic testing of CREATE OR REPLACE TABLE mysql-test/r/partition_exchange.result: New error message mysql-test/r/ps_ddl.result: Fewer reprepares with new code mysql-test/suite/archive/discover.result: Don't rediscover archive tables if the .frm file exists (Sergei will look at this if there is a better way...) mysql-test/suite/archive/discover.test: Don't rediscover archive tables if the .frm file exists (Sergei will look at this if there is a better way...) mysql-test/suite/funcs_1/r/innodb_views.result: New error message mysql-test/suite/funcs_1/r/memory_views.result: New error message mysql-test/suite/rpl/disabled.def: rpl_row_create_table should now be safe to use mysql-test/suite/rpl/r/rpl_row_create_table.result: Updated results after adding back disabled test mysql-test/suite/rpl/t/rpl_create_if_not_exists.test: Added comment mysql-test/suite/rpl/t/rpl_row_create_table.test: Added CREATE OR REPLACE TABLE test mysql-test/t/create.test: Added CREATE OR REPLACE TABLE test mysql-test/t/create_or_replace-master.opt: Create logs mysql-test/t/create_or_replace.test: Basic testing of CREATE OR REPLACE TABLE mysql-test/t/partition_exchange.test: Error number changed as we are now using same code for all log table change issues mysql-test/t/ps_ddl.test: Fewer reprepares with new code sql/handler.h: Moved things around a bit in a structure to get better alignment. Added HA_LEX_CREATE_REPLACE to mark if we are using CREATE OR REPLACE Added 3 elements to end of HA_CREATE_INFO to be able to store state to add backs locks in case of LOCK TABLES. sql/log.cc: Reimplemented check_if_log_table(): - Simpler and faster usage - Can give error messages This gives us one code path for allmost all error messages if log tables are in use sql/log.h: New interface for check_if_log_table() sql/slave.cc: More logging sql/sql_alter.cc: New interface for check_if_log_table() sql/sql_base.cc: More documentation Changed interface for drop_temporary_table() to make it more reusable Changed Locked_tables_list::init_locked_tables() to work on the table object instead of the table list object. Before this it used a mix of both, which was not good. Locked_tables_list::unlock_locked_tables(THD *thd) now requires a valid thd argument. Old usage of calling this with 0 i changed to instead call Locked_tables_list::reset() Added functions Locked_tables_list:restore_lock() and Locked_tables_list::add_back_last_deleted_lock() to be able to easily add back a locked table to the lock list. Check for command number instead of open_strategy of CREATE TABLE was used. Added restart_trans_for_tables() to be able to restart a transaction. This was needed in "create or replace ... select" between the drop table and the select. sql/sql_base.h: Added and updated function prototypes sql/sql_class.h: Added new prototypes to Locked_tables_list class Added extra argument to select_create to avoid double call to eof() or send_error() - I needed this in some edge case where the table was not created against expections. sql/sql_db.cc: New interface for check_if_log_table() sql/sql_insert.cc: Remember position to lock information so that we can reaquire table lock for LOCK TABLES + CREATE OR REPLACE TABLE SELECT. Later add back the lock by calling restore_lock(). Removed one not needed indentation level in create_table_from_items() Ensure we don't call send_eof() or abort_result_set() twice. sql/sql_lex.h: Removed variable that I temporarly added in an earlier changeset sql/sql_parse.cc: Removed old test code (marked with QQ) Ensure that we have open_strategy set as TABLE_LIST::OPEN_STUB in CREATE TABLE Removed some IF NOT EXISTS code as this is now handled in create_table_table_impl(). Set OPTION_KEEP_LOGS later. This code had to be moved as the test for IF EXISTS has changed place. DROP_ACL is required if one uses CREATE TABLE OR REPLACE. sql/sql_partition_admin.cc: New interface for check_if_log_table() sql/sql_rename.cc: New interface for check_if_log_table() sql/sql_table.cc: New interface for check_if_log_table() Moved some code in mysql_rm_table() under a common test. - Safe as temporary tables doesn't have statistics. - !is_temporary_table(table) test was moved out from drop_temporary_table() and merged with upper level code. - Added drop of normal and temporary tables in create_table_imp() if CREATE OR REPLACE was used. - Added reacquiring of table locks in mysql_create_table() and mysql_create_like_table() - In mysql_create_like_table(), restore table->open_strategy() if it was changed. - Re-test if table was a view after opening it. sql/sql_table.h: New prototype for mysql_create_table_no_lock() sql/sql_yacc.yy: Added syntax for CREATE OR REPLACE TABLE Reuse new code for CREATE OR REPLACE VIEW sql/table.h: Added name for enum type sql/table_cache.cc: More DBUG
297 lines
7.5 KiB
Plaintext
297 lines
7.5 KiB
Plaintext
# Testing table creations for row-based replication.
|
|
|
|
--source include/have_binlog_format_row.inc
|
|
--source include/master-slave.inc
|
|
--source include/have_innodb.inc
|
|
connection slave;
|
|
--source include/have_innodb.inc
|
|
connection master;
|
|
|
|
# Bug#18326: Do not lock table for writing during prepare of statement
|
|
# The use of the ps protocol causes extra table maps in the binlog, so
|
|
# we disable the ps-protocol for this statement.
|
|
--disable_ps_protocol
|
|
|
|
# Set the default storage engine to different values on master and
|
|
# slave. We need to stop the slave for the server variable to take
|
|
# effect, since the variable is only read on start-up.
|
|
sync_slave_with_master;
|
|
--disable_query_log
|
|
set @storage_engine = @@global.storage_engine;
|
|
STOP SLAVE;
|
|
--source include/wait_for_slave_to_stop.inc
|
|
SET GLOBAL storage_engine=memory;
|
|
START SLAVE;
|
|
--source include/wait_for_slave_to_start.inc
|
|
--enable_query_log
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
CREATE TABLE t1 (a INT);
|
|
CREATE OR REPLACE TABLE t1 (a INT, b INT);
|
|
CREATE TABLE t2 (a INT, b INT) ENGINE=Merge;
|
|
CREATE TABLE t3 (a INT, b INT) CHARSET=utf8;
|
|
CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8;
|
|
--source include/show_binlog_events.inc
|
|
--echo **** On Master ****
|
|
--query_vertical SHOW CREATE TABLE t1
|
|
--query_vertical SHOW CREATE TABLE t2
|
|
--query_vertical SHOW CREATE TABLE t3
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
--query_vertical SHOW CREATE TABLE t1
|
|
--query_vertical SHOW CREATE TABLE t2
|
|
--query_vertical SHOW CREATE TABLE t3
|
|
|
|
connection master;
|
|
CREATE TABLE t5 (b INT, c INT) SELECT * FROM t3;
|
|
|
|
CREATE TEMPORARY TABLE tt3 (a INT, b INT);
|
|
INSERT INTO tt3 VALUES (1,2), (2,4), (3,6), (4,2), (5,10), (6,12);
|
|
CREATE TABLE t6 (b INT, c INT) SELECT * FROM tt3;
|
|
--echo **** On Master ****
|
|
--query_vertical SHOW CREATE TABLE t5
|
|
SELECT * FROM t5 ORDER BY a,b,c;
|
|
--query_vertical SHOW CREATE TABLE t6
|
|
SELECT * FROM t6 ORDER BY a,b,c;
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
--query_vertical SHOW CREATE TABLE t5
|
|
SELECT * FROM t5 ORDER BY a,b,c;
|
|
--query_vertical SHOW CREATE TABLE t6
|
|
SELECT * FROM t6 ORDER BY a,b,c;
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
# Test for erroneous constructions
|
|
--error ER_DUP_ENTRY
|
|
CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
|
|
# Shouldn't be written to the binary log
|
|
--source include/show_binlog_events.inc
|
|
|
|
# Test that INSERT-SELECT works the same way as for SBR.
|
|
CREATE TABLE t7 (a INT, b INT UNIQUE);
|
|
--error ER_DUP_ENTRY
|
|
INSERT INTO t7 SELECT a,b FROM tt3;
|
|
SELECT * FROM t7 ORDER BY a,b;
|
|
# Should be written to the binary log
|
|
--source include/show_binlog_events.inc
|
|
sync_slave_with_master;
|
|
SELECT * FROM t7 ORDER BY a,b;
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
CREATE TEMPORARY TABLE tt4 (a INT, b INT);
|
|
INSERT INTO tt4 VALUES (4,8), (5,10), (6,12);
|
|
BEGIN;
|
|
INSERT INTO t7 SELECT a,b FROM tt4;
|
|
ROLLBACK;
|
|
--source include/show_binlog_events.inc
|
|
SELECT * FROM t7 ORDER BY a,b;
|
|
sync_slave_with_master;
|
|
SELECT * FROM t7 ORDER BY a,b;
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
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
|
|
--source include/show_binlog_events.inc
|
|
sync_slave_with_master;
|
|
--echo **** On Slave ****
|
|
--query_vertical SHOW CREATE TABLE t8
|
|
--query_vertical SHOW CREATE TABLE t9
|
|
|
|
connection master;
|
|
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7,t8,t9;
|
|
sync_slave_with_master;
|
|
# Here we reset the value of the default storage engine
|
|
STOP SLAVE;
|
|
--source include/wait_for_slave_to_stop.inc
|
|
SET GLOBAL storage_engine=@storage_engine;
|
|
START SLAVE;
|
|
--source include/wait_for_slave_to_start.inc
|
|
--enable_ps_protocol
|
|
|
|
# BUG#22864 (Rollback following CREATE ... SELECT discards 'CREATE
|
|
# table' from log):
|
|
--echo ================ BUG#22864 ================
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
SET AUTOCOMMIT=0;
|
|
CREATE TABLE t1 (a INT);
|
|
INSERT INTO t1 VALUES (1),(2),(3);
|
|
|
|
CREATE TABLE t2 ENGINE=INNODB SELECT * FROM t1;
|
|
ROLLBACK;
|
|
|
|
CREATE TABLE t3 ENGINE=INNODB SELECT * FROM t1;
|
|
INSERT INTO t3 VALUES (4),(5),(6);
|
|
ROLLBACK;
|
|
|
|
CREATE TABLE t4 ENGINE=INNODB SELECT * FROM t1;
|
|
INSERT INTO t1 VALUES (4),(5),(6);
|
|
ROLLBACK;
|
|
|
|
SHOW TABLES;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
--source include/show_binlog_events.inc
|
|
sync_slave_with_master;
|
|
SHOW TABLES;
|
|
SELECT * FROM t1 ORDER BY a;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
SELECT * FROM t3 ORDER BY a;
|
|
SELECT * FROM t4 ORDER BY a;
|
|
|
|
connection master;
|
|
DROP TABLE IF EXISTS t1,t2,t3,t4;
|
|
SET AUTOCOMMIT=1;
|
|
sync_slave_with_master;
|
|
|
|
# Some tests with temporary tables
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
CREATE TABLE t1 (a INT);
|
|
INSERT INTO t1 VALUES (1),(2),(3);
|
|
|
|
CREATE TABLE t2 (a INT) ENGINE=INNODB;
|
|
|
|
BEGIN;
|
|
INSERT INTO t2 SELECT a*a FROM t1;
|
|
CREATE TEMPORARY TABLE tt1
|
|
SELECT a+1 AS a
|
|
FROM t1
|
|
WHERE a MOD 2 = 1;
|
|
INSERT INTO t2 SELECT a+2 FROM tt1;
|
|
COMMIT;
|
|
|
|
SELECT * FROM t2 ORDER BY a;
|
|
--source include/show_binlog_events.inc
|
|
sync_slave_with_master;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
|
|
connection master;
|
|
TRUNCATE TABLE t2;
|
|
sync_slave_with_master;
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
BEGIN;
|
|
INSERT INTO t2 SELECT a*a FROM t1;
|
|
CREATE TEMPORARY TABLE tt2
|
|
SELECT a+1 AS a
|
|
FROM t1
|
|
WHERE a MOD 2 = 1;
|
|
INSERT INTO t2 SELECT a+2 FROM tt2;
|
|
ROLLBACK;
|
|
|
|
SELECT * FROM t2 ORDER BY a;
|
|
source include/show_binlog_events.inc;
|
|
sync_slave_with_master;
|
|
SELECT * FROM t2 ORDER BY a;
|
|
|
|
connection master;
|
|
DROP TABLE t1,t2;
|
|
sync_slave_with_master;
|
|
|
|
#
|
|
# bug#35762 Failing CREATE-SELECT produces bad binlog in row mode
|
|
#
|
|
|
|
connection master;
|
|
|
|
CREATE TABLE t1 (a INT);
|
|
|
|
INSERT INTO t1 VALUES (1),(1);
|
|
--error ER_DUP_ENTRY
|
|
CREATE TABLE t2 (a INT UNIQUE) ENGINE=INNODB SELECT * FROM t1;
|
|
INSERT INTO t1 VALUES (2);
|
|
|
|
sync_slave_with_master;
|
|
# connection slave;
|
|
|
|
--echo *** the proof of the fix:
|
|
--echo select must show that the last insert performed on the slave ***
|
|
SELECT * FROM t1;
|
|
|
|
connection master;
|
|
DROP TABLE t1;
|
|
sync_slave_with_master;
|
|
|
|
#
|
|
# BUG#34707: Row based replication: slave creates table within wrong database
|
|
#
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
--disable_warnings
|
|
DROP DATABASE IF EXISTS mysqltest1;
|
|
--enable_warnings
|
|
CREATE DATABASE mysqltest1;
|
|
|
|
CREATE TABLE mysqltest1.without_select (f1 BIGINT);
|
|
CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1;
|
|
source include/show_binlog_events.inc;
|
|
sync_slave_with_master;
|
|
|
|
connection master;
|
|
DROP DATABASE mysqltest1;
|
|
sync_slave_with_master;
|
|
|
|
#
|
|
# BUG#48506: crash in CREATE TABLE <existing_view> IF NOT EXISTS LIKE
|
|
# <tmp_tbl> with RBL
|
|
#
|
|
|
|
--source include/rpl_reset.inc
|
|
|
|
connection master;
|
|
CREATE TEMPORARY TABLE t7(c1 INT);
|
|
CREATE TABLE t5(c1 INT);
|
|
CREATE TABLE t4(c1 INT);
|
|
CREATE VIEW bug48506_t1 AS SELECT 1;
|
|
CREATE VIEW bug48506_t2 AS SELECT * FROM t4;
|
|
CREATE VIEW bug48506_t3 AS SELECT t5.c1 AS A, t4.c1 AS B FROM t5, t4;
|
|
CREATE TABLE bug48506_t4(c1 INT);
|
|
--disable_warnings
|
|
sync_slave_with_master;
|
|
DROP VIEW bug48506_t1, bug48506_t2, bug48506_t3;
|
|
DROP TABLE bug48506_t4;
|
|
|
|
connection master;
|
|
CREATE TABLE IF NOT EXISTS bug48506_t1 LIKE t7;
|
|
CREATE TABLE IF NOT EXISTS bug48506_t2 LIKE t7;
|
|
CREATE TABLE IF NOT EXISTS bug48506_t3 LIKE t7;
|
|
CREATE TABLE IF NOT EXISTS bug48506_t4 LIKE t7;
|
|
--enable_warnings
|
|
sync_slave_with_master;
|
|
|
|
SHOW TABLES LIKE 'bug48506%';
|
|
|
|
connection master;
|
|
DROP VIEW IF EXISTS bug48506_t1, bug48506_t2, bug48506_t3;
|
|
DROP TEMPORARY TABLES t7;
|
|
DROP TABLES t4, t5;
|
|
DROP TABLES IF EXISTS bug48506_t4;
|
|
|
|
--source include/rpl_end.inc
|
|
|
|
--echo end of the tests
|