Merge branch '10.1-release' into 10.1

CMakeLists.txt

@@ -144,8 +144,6 @@ INCLUDE(mysql_version)
 INCLUDE(cpack_source_ignore_files)
 INCLUDE(install_layout)
 INCLUDE(wsrep)
-INCLUDE(cpack_rpm)
-INCLUDE(cpack_deb)
 
 # Add macros
 INCLUDE(character_sets)
@@ -395,6 +393,9 @@ IF(WITH_UNIT_TESTS)
  ENDIF()
 ENDIF()
 
+INCLUDE(cpack_rpm)
+INCLUDE(cpack_deb)
+
 SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
 # Add storage engines and plugins.
 CONFIGURE_PLUGINS()

cmake/cpack_rpm.cmake

@@ -232,6 +232,14 @@ ELSEIF(RPM MATCHES "fedora" OR RPM MATCHES "(rhel|centos)7")
   ALTERNATIVE_NAME("shared" "mysql-libs")
   ALTERNATIVE_NAME("test"   "mariadb-test")
   SET(CPACK_RPM_common_PACKAGE_CONFLICTS "mariadb-libs < 1:%{version}-%{release}") 
+ELSEIF(RPM MATCHES "sles")
+  ALTERNATIVE_NAME("server" "mariadb")
+  SETA(CPACK_RPM_server_PACKAGE_PROVIDES
+    "mysql = %{version}-%{release}"
+    "mariadb_${MAJOR_VERSION}${MINOR_VERSION} = %{version}-%{release}"
+    "mariadb-${MAJOR_VERSION}${MINOR_VERSION} = %{version}-%{release}"
+    "mariadb-server = %{version}-%{release}"
+  )
 ENDIF()
 
 # If we want to build build MariaDB-shared-compat,

mysql-test/r/processlist_notembedded.result

 #
 # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
 #
-SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
+SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go';
 SET DEBUG_SYNC= 'now WAIT_FOR in_sync';
 FOUND /sleep/ in MDEV-20466.text
+SET DEBUG_SYNC= 'now SIGNAL go';
 SET DEBUG_SYNC = 'RESET';
 End of 5.5 tests

mysql-test/suite/innodb/r/foreign_key.result

@@ -130,3 +130,106 @@ ALTER TABLE t1 DROP f3;
 ALTER TABLE t1 CHANGE f f3 INT;
 DROP TABLE t1;
 SET FOREIGN_KEY_CHECKS=1;
+#
+# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+# ADD FOREIGN KEY
+#
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+drop table title, department, people;
+create table t1 (a int primary key, b int) engine=innodb;
+create table t2 (c int primary key, d int,
+foreign key (d) references t1 (a) on update cascade) engine=innodb;
+insert t1 values (1,1),(2,2),(3,3);
+insert t2 values (4,1),(5,2),(6,3);
+flush table t2 with read lock;
+delete from t1 where a=2;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`d`) REFERENCES `t1` (`a`) ON UPDATE CASCADE)
+update t1 set a=10 where a=1;
+unlock tables;
+lock table t2 write;
+delete from t1 where a=2;
+unlock tables;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`d`) REFERENCES `t1` (`a`) ON UPDATE CASCADE)
+unlock tables;
+create user foo;
+grant select,update on test.t1 to foo;
+update t1 set a=30 where a=3;
+select * from t2;
+c	d
+5	2
+4	10
+6	30
+drop table t2, t1;
+drop user foo;
+#
+# MDEV-17595 - Server crashes in copy_data_between_tables or
+#              Assertion `thd->transaction.stmt.is_empty() ||
+#              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)'
+#              fails in close_tables_for_reopen upon concurrent
+#              ALTER TABLE and FLUSH
+#
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1),(2);
+CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB;
+INSERT INTO t2 VALUES(2);
+ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE;
+DROP TABLE t2, t1;
+create table t1 (pk int primary key, data int) engine=innodb;
+insert t1 values (1,1),(2,2),(3,3);
+create table t2 (t1_pk int, foreign key (t1_pk) references t1 (pk)) engine=innodb;
+insert t2 values (1),(2);
+insert t2 values (10);
+ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`t1_pk`) REFERENCES `t1` (`pk`))
+flush tables;
+flush status;
+update t1 set data=10 where pk+1>10;
+show status like '%opened_tab%';
+Variable_name	Value
+Opened_table_definitions	1
+Opened_tables	1
+flush tables;
+flush status;
+update t2 set t1_pk=11 where t1_pk+1>10;
+show status like '%opened_tab%';
+Variable_name	Value
+Opened_table_definitions	1
+Opened_tables	1
+flush tables;
+flush status;
+lock tables t1 write;
+show status like '%opened_tab%';
+Variable_name	Value
+Opened_table_definitions	2
+Opened_tables	2
+insert t1 values (4,4);
+show status like '%opened_tab%';
+Variable_name	Value
+Opened_table_definitions	2
+Opened_tables	2
+unlock tables;
+create function foo() returns int
+begin
+insert t1 values (5,5);
+return 5;
+end|
+flush tables;
+flush status;
+select foo();
+foo()
+5
+show status like '%opened_tab%';
+Variable_name	Value
+Opened_table_definitions	2
+Opened_tables	2
+drop function foo;
+drop table t2, t1;

mysql-test/suite/innodb/r/foreign-keys.result → mysql-test/suite/innodb/r/foreign_key_debug.result

-#
-# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
-# ADD FOREIGN KEY
-#
-CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
-PRIMARY KEY (`department_id`)) engine=innodb;
-CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
-CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
-ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
-`people` (`people_id`);
-ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
-(`people_id`);
-ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
-(`people_id`);
-drop table title, department, people;
-create table t1 (a int primary key, b int) engine=innodb;
-create table t2 (c int primary key, d int,
-foreign key (d) references t1 (a) on update cascade) engine=innodb;
-insert t1 values (1,1),(2,2),(3,3);
-insert t2 values (4,1),(5,2),(6,3);
-flush table t2 with read lock;
-connect  con1,localhost,root;
-delete from t1 where a=2;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`d`) REFERENCES `t1` (`a`) ON UPDATE CASCADE)
-update t1 set a=10 where a=1;
-connection default;
-unlock tables;
-connection con1;
-connection default;
-lock table t2 write;
-connection con1;
-delete from t1 where a=2;
-connection default;
-unlock tables;
-connection con1;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`t2`, CONSTRAINT `t2_ibfk_1` FOREIGN KEY (`d`) REFERENCES `t1` (`a`) ON UPDATE CASCADE)
-connection default;
-unlock tables;
-disconnect con1;
-create user foo;
-grant select,update on test.t1 to foo;
-connect foo,localhost,foo;
-update t1 set a=30 where a=3;
-disconnect foo;
-connection default;
-select * from t2;
-c	d
-5	2
-4	10
-6	30
-drop table t2, t1;
-drop user foo;
 create table t1 (f1 int primary key) engine=innodb;
 create table t2 (f2 int primary key) engine=innodb;
 create table t3 (f3 int primary key, foreign key (f3) references t2(f2)) engine=innodb;
@@ -88,19 +35,6 @@ drop table t2;
 drop table t1;
 set debug_sync='reset';
 #
-# MDEV-17595 - Server crashes in copy_data_between_tables or
-#              Assertion `thd->transaction.stmt.is_empty() ||
-#              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)'
-#              fails in close_tables_for_reopen upon concurrent
-#              ALTER TABLE and FLUSH
-#
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB;
-INSERT INTO t1 VALUES(1),(2);
-CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB;
-INSERT INTO t2 VALUES(2);
-ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE;
-DROP TABLE t2, t1;
-#
 # MDEV-16060 - InnoDB: Failing assertion: ut_strcmp(index->name, key->name)
 #
 CREATE TABLE t1 (`pk` INT PRIMARY KEY) ENGINE=InnoDB;

mysql-test/suite/innodb/t/foreign_key.test

@@ -158,3 +158,133 @@ ALTER TABLE t1 CHANGE f f3 INT;
 DROP TABLE t1;
 
 SET FOREIGN_KEY_CHECKS=1;
+
+--echo #
+--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+--echo # ADD FOREIGN KEY
+--echo #
+
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
+
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
+
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+
+drop table title, department, people;
+
+#
+# FK and prelocking:
+# child table accesses (reads and writes) wait for locks.
+#
+create table t1 (a int primary key, b int) engine=innodb;
+create table t2 (c int primary key, d int,
+  foreign key (d) references t1 (a) on update cascade) engine=innodb;
+insert t1 values (1,1),(2,2),(3,3);
+insert t2 values (4,1),(5,2),(6,3);
+flush table t2 with read lock; # this takes MDL_SHARED_NO_WRITE
+connect (con1,localhost,root);
+--error ER_ROW_IS_REFERENCED_2
+delete from t1 where a=2;
+send update t1 set a=10 where a=1;
+connection default;
+let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
+source include/wait_condition.inc;
+unlock tables;
+connection con1;
+reap;
+connection default;
+lock table t2 write; # this takes MDL_SHARED_NO_READ_WRITE
+connection con1;
+send delete from t1 where a=2;
+connection default;
+let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
+source include/wait_condition.inc;
+unlock tables;
+connection con1;
+--error ER_ROW_IS_REFERENCED_2
+reap;
+connection default;
+unlock tables;
+disconnect con1;
+
+# but privileges should not be checked
+create user foo;
+grant select,update on test.t1 to foo;
+connect(foo,localhost,foo);
+update t1 set a=30 where a=3;
+disconnect foo;
+connection default;
+select * from t2;
+drop table t2, t1;
+drop user foo;
+
+--echo #
+--echo # MDEV-17595 - Server crashes in copy_data_between_tables or
+--echo #              Assertion `thd->transaction.stmt.is_empty() ||
+--echo #              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)'
+--echo #              fails in close_tables_for_reopen upon concurrent
+--echo #              ALTER TABLE and FLUSH
+--echo #
+CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1),(2);
+CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB;
+INSERT INTO t2 VALUES(2);
+ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE;
+DROP TABLE t2, t1;
+
+#
+# MDEV-22180 Planner opens unnecessary tables when updated table is referenced by foreign keys
+#
+
+create table t1 (pk int primary key, data int) engine=innodb;
+insert t1 values (1,1),(2,2),(3,3);
+create table t2 (t1_pk int, foreign key (t1_pk) references t1 (pk)) engine=innodb;
+insert t2 values (1),(2);
+error ER_NO_REFERENCED_ROW_2;
+insert t2 values (10);
+flush tables;
+flush status;
+# with ON UPDATE RESTRICT child tables are not opened
+update t1 set data=10 where pk+1>10;
+show status like '%opened_tab%';
+flush tables;
+flush status;
+# neither are parent tables
+update t2 set t1_pk=11 where t1_pk+1>10;
+show status like '%opened_tab%';
+# under LOCK TABLES
+flush tables;
+flush status;
+lock tables t1 write;
+show status like '%opened_tab%';
+insert t1 values (4,4);
+show status like '%opened_tab%';
+unlock tables;
+delimiter |;
+create function foo() returns int
+begin
+  insert t1 values (5,5);
+  return 5;
+end|
+delimiter ;|
+flush tables;
+flush status;
+select foo();
+show status like '%opened_tab%';
+drop function foo;
+drop table t2, t1;
+
+#
+# End of 10.1 tests
+#

mysql-test/suite/innodb/t/foreign-keys.test → mysql-test/suite/innodb/t/foreign_key_debug.test

@@ -4,76 +4,6 @@
 
 --enable_connect_log
 
---echo #
---echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
---echo # ADD FOREIGN KEY
---echo #
-
-CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
-PRIMARY KEY (`department_id`)) engine=innodb;
-
-CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
-`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
-
-CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
-
-ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
-`people` (`people_id`);
-
-ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
-(`people_id`);
-
-ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
-(`people_id`);
-
-drop table title, department, people;
-
-#
-# FK and prelocking:
-# child table accesses (reads and writes) wait for locks.
-#
-create table t1 (a int primary key, b int) engine=innodb;
-create table t2 (c int primary key, d int,
-  foreign key (d) references t1 (a) on update cascade) engine=innodb;
-insert t1 values (1,1),(2,2),(3,3);
-insert t2 values (4,1),(5,2),(6,3);
-flush table t2 with read lock; # this takes MDL_SHARED_NO_WRITE
-connect (con1,localhost,root);
---error ER_ROW_IS_REFERENCED_2
-delete from t1 where a=2;
-send update t1 set a=10 where a=1;
-connection default;
-let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
-source include/wait_condition.inc;
-unlock tables;
-connection con1;
-reap;
-connection default;
-lock table t2 write; # this takes MDL_SHARED_NO_READ_WRITE
-connection con1;
-send delete from t1 where a=2;
-connection default;
-let $wait_condition= select 1 from information_schema.processlist where state='Waiting for table metadata lock';
-source include/wait_condition.inc;
-unlock tables;
-connection con1;
---error ER_ROW_IS_REFERENCED_2
-reap;
-connection default;
-unlock tables;
-disconnect con1;
-
-# but privileges should not be checked
-create user foo;
-grant select,update on test.t1 to foo;
-connect(foo,localhost,foo);
-update t1 set a=30 where a=3;
-disconnect foo;
-connection default;
-select * from t2;
-drop table t2, t1;
-drop user foo;
-
 #
 # MDEV-16465 Invalid (old?) table or database name or hang in ha_innobase::delete_table and log semaphore wait upon concurrent DDL with foreign keys
 #
@@ -112,22 +42,6 @@ drop table t2;
 drop table t1;
 set debug_sync='reset';
 
-
---echo #
---echo # MDEV-17595 - Server crashes in copy_data_between_tables or
---echo #              Assertion `thd->transaction.stmt.is_empty() ||
---echo #              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL)'
---echo #              fails in close_tables_for_reopen upon concurrent
---echo #              ALTER TABLE and FLUSH
---echo #
-CREATE TABLE t1 (a INT, KEY(a)) ENGINE=InnoDB;
-INSERT INTO t1 VALUES(1),(2);
-CREATE TABLE t2 (b INT, KEY(b)) ENGINE=InnoDB;
-INSERT INTO t2 VALUES(2);
-ALTER TABLE t2 ADD FOREIGN KEY(b) REFERENCES t1(a), LOCK=EXCLUSIVE;
-DROP TABLE t2, t1;
-
-
 --echo #
 --echo # MDEV-16060 - InnoDB: Failing assertion: ut_strcmp(index->name, key->name)
 --echo #
@@ -158,3 +72,7 @@ connection default;
 SET debug_sync='reset';
 SHOW OPEN TABLES FROM test;
 DROP TABLE t1, t2;
+
+#
+# End of 10.1 tests
+#

mysql-test/t/processlist_notembedded.test

 source include/have_debug.inc;
 source include/have_debug_sync.inc;
 source include/not_embedded.inc;
+source include/count_sessions.inc;
 
 --echo #
 --echo # MDEV-20466: SHOW PROCESSLIST truncates query text on \0 bytes
@@ -10,9 +11,9 @@ connect (con1,localhost,root,,);
 
 connection con1;
 
-let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "' or sleep (30)")`;
+let $q= `select CONCAT("SELECT user FROM mysql.user WHERE user ='some", CHAR(0), "sleep'")`;
 
-SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync';
+SET DEBUG_SYNC= 'before_join_optimize SIGNAL in_sync WAIT_FOR go';
 --disable_query_log
 --send_eval $q;
 --enable_query_log
@@ -27,8 +28,12 @@ let SEARCH_PATTERN=sleep;
 source include/search_pattern_in_file.inc;
 remove_file $MYSQLTEST_VARDIR/tmp//MDEV-20466.text;
 
+SET DEBUG_SYNC= 'now SIGNAL go';
+
 disconnect con1;
 
 SET DEBUG_SYNC = 'RESET';
 
+source include/wait_until_count_sessions.inc;
+
 --echo End of 5.5 tests

sql/sql_base.cc

@@ -5037,10 +5037,19 @@ bool Lock_tables_prelocking_strategy::
 handle_table(THD *thd, Query_tables_list *prelocking_ctx,
              TABLE_LIST *table_list, bool *need_prelocking)
 {
+  TABLE_LIST **last= prelocking_ctx->query_tables_last;
+
   if (DML_prelocking_strategy::handle_table(thd, prelocking_ctx, table_list,
                                             need_prelocking))
     return TRUE;
 
+  /*
+    normally we don't need to open FK-prelocked tables for RESTRICT,
+    MDL is enough. But under LOCK TABLES we have to open everything
+  */
+  for (TABLE_LIST *tl= *last; tl; tl= tl->next_global)
+    tl->open_strategy= TABLE_LIST::OPEN_NORMAL;
+
   /* We rely on a caller to check that table is going to be changed. */
   DBUG_ASSERT(table_list->lock_type >= TL_WRITE_ALLOW_WRITE);
 

sql/table.h

@@ -1813,6 +1813,9 @@ struct TABLE_LIST
     open_type= routine ? OT_TEMPORARY_OR_BASE : OT_BASE_ONLY;
     belong_to_view= belong_to_view_arg;
     trg_event_map= trg_event_map_arg;
+    /* MDL is enough for read-only FK checks, we don't need the table */
+    if (prelocking_placeholder == FK && lock_type < TL_WRITE_ALLOW_WRITE)
+      open_strategy= OPEN_STUB;
 
     **last_ptr= this;
     prev_global= *last_ptr;