Skip to content

Commit 2bd41fc

Browse files
committed
Revert MDEV-25292 Atomic CREATE OR REPLACE TABLE
Specifically: Revert "MDEV-29664 Assertion `!n_mysql_tables_in_use' failed in innobase_close_connection" This reverts commit ba875e9. Revert "MDEV-29620 Assertion `next_insert_id == 0' failed in handler::ha_external_lock" This reverts commit aa08a74. Revert "MDEV-29628 Memory leak after CREATE OR REPLACE with foreign key" This reverts commit c579d66. Revert "MDEV-29609 create_not_windows test fails with different result" This reverts commit cb583b2. Revert "MDEV-29544 SIGSEGV in HA_CREATE_INFO::finalize_locked_tables" This reverts commit dcd66c3. Revert "MDEV-28933 CREATE OR REPLACE fails to recreate same constraint name" This reverts commit cf6c517. Revert "MDEV-28933 Moved RENAME_CONSTRAINT_IDS to include/sql_funcs.h" This reverts commit f1e1c13. Revert "MDEV-28956 Locking is broken if CREATE OR REPLACE fails under LOCK TABLES" This reverts commit a228ec8. Revert "MDEV-25292 gcol.gcol_bugfixes --ps fix" This reverts commit 24fff82. Revert "MDEV-25292 Disable atomic replace for slave-generated or-replace" This reverts commit 2af1591. Revert "MDEV-25292 backup_log improved" This reverts commit 34398a2. Revert "MDEV-25292 Atomic CREATE OR REPLACE TABLE" This reverts commit 93c8252. Revert "MDEV-25292 Table_name class for (db, table_name, alias)" This reverts commit d145dda. Revert "MDEV-25292 ha_table_exists() cleanup and improvement" This reverts commit 409b8a8. Revert "MDEV-25292 Cleanups" This reverts commit 595dad8. Revert "MDEV-25292 Refactoring: moved select_field_count into Alter_info." This reverts commit f02af1d.
1 parent d152609 commit 2bd41fc

File tree

92 files changed

+1385
-9509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1385
-9509
lines changed

mysql-test/include/binlog_formats.combinations

Lines changed: 0 additions & 8 deletions
This file was deleted.

mysql-test/include/binlog_formats.inc

Lines changed: 0 additions & 4 deletions
This file was deleted.

mysql-test/main/backup_log.inc

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# non-partitioned testing
88

99
--echo #
10-
--echo # Testing normal tables
10+
--echo # Testing with normal tables
1111
--echo #
1212

1313
eval create table t1 (a int) engine=myisam $part_int;
@@ -20,8 +20,6 @@ repair table t1;
2020
optimize table t1;
2121
drop table t1;
2222

23-
--source backup_log_print.inc
24-
2523
eval create table t1_innodb (a int) engine=innodb $part_int;
2624
insert into t1_innodb values (1),(2);
2725
alter table t1_innodb add column b int;
@@ -32,8 +30,6 @@ repair table t1_innodb;
3230
optimize table t1_innodb;
3331
drop table t1_innodb;
3432

35-
--source backup_log_print.inc
36-
3733
--echo #
3834
--echo # Testing with temporary tables (should not be logged)
3935
--echo #
@@ -45,8 +41,6 @@ rename table tmp_t11 to tmp_t10;
4541
truncate table tmp_t10;
4642
drop table tmp_t10;
4743

48-
--source backup_log_print.inc
49-
5044
--echo #
5145
--echo # Testing with mix of normal and temporary tables
5246
--echo #
@@ -60,8 +54,6 @@ eval create table t21 (a int) $part_int;
6054
drop temporary table if exists tmp_t21,t21;
6155
drop table if exists tmp_t21,t21;
6256

63-
--source backup_log_print.inc
64-
6557
--echo #
6658
--echo # Testing create select
6759
--echo #
@@ -76,8 +68,6 @@ eval create or replace table t31 (a int primary key) $part_int select * from t30
7668
eval create table t32 (a int) $part_int;
7769
drop table if exists t30,t31,t32,tmp_t30;
7870

79-
--source backup_log_print.inc
80-
8171
--echo #
8272
--echo # Testing create LIKE
8373
--echo #
@@ -91,8 +81,6 @@ create or replace table t42 like t41;
9181
show create table t42;
9282
drop table t40, t41, t42;
9383

94-
--source backup_log_print.inc
95-
9684
--echo #
9785
--echo # Testing rename
9886
--echo #
@@ -103,8 +91,6 @@ rename table t50 to t52, t51 to t53;
10391
rename table t52 to tmp, t53 to t52, tmp to t53;
10492
drop table t52,t53;
10593

106-
--source backup_log_print.inc
107-
10894
--echo #
10995
--echo # Testing enable/disable keys
11096
--echo #
@@ -121,8 +107,6 @@ INSERT INTO t61 VALUES(1),(2),(3);
121107
ALTER TABLE t61 DISABLE KEYS;
122108
DROP TABLE t61;
123109

124-
--source backup_log_print.inc
125-
126110
--echo #
127111
--echo # Testing load data
128112
--echo #
@@ -144,17 +128,13 @@ insert into t71 select * from t70;
144128
unlock tables;
145129
drop table t70,t71;
146130

147-
--source backup_log_print.inc
148-
149131
--echo #
150132
--echo # Testing strange table names
151133
--echo #
152134

153135
eval create table `t 1` (a int) $part_int;
154136
drop table `t 1`;
155137

156-
--source backup_log_print.inc
157-
158138
--echo #
159139
--echo # Testing views and triggers
160140
--echo #
@@ -166,14 +146,10 @@ drop trigger trg;
166146
drop view v1;
167147
drop table t80;
168148

169-
--source backup_log_print.inc
170-
171149
--echo #
172150
--echo # Testing alter to a new storage engine
173151
--echo #
174152

175153
eval create table t85 (a int primary key, b int) engine=myisam $part_int;
176154
alter table t85 engine=innodb;
177155
drop table t85;
178-
179-
--source backup_log_print.inc

0 commit comments

Comments
 (0)