Merge mysql-8.0 -> trunk

Author: blaudden

mysql-test/suite/ndb_binlog/r/ndb_binlog_restart.result

@@ -49,8 +49,6 @@ Disconnect both mysqld servers from all datanodes -> binlog restarts
 Wait for 'server1' binlog rotate to indicate disconnect
 Wait for 'server2' binlog rotate to indicate disconnect
 Wait for (fast) 'server1' to complete setup and get out of read-only mode
-Reading 'mysql.ndb_schema' on 'server2' announce schema distr. participation as a side effect.
-select * from mysql.ndb_schema where db="" and name="";
 Create table operation on 'server1' grab MDL lock while waiting for
 schema distribution to all subscribing mysqld -> stuck on 'server2'
 create table t1 (a int primary key) engine=ndb;

mysql-test/suite/ndb_binlog/t/ndb_binlog_discover.test

@@ -20,8 +20,8 @@ reset master;
 let $mysql_errno= 1;
 while ($mysql_errno)
 {
- # Table t1 is readonly until the mysqld has reconnected properly
- --error 0,1036,1296
+ # Table t1 can't be opened until the mysqld has reconnected properly
+ --error 0,ER_GET_ERRMSG
  insert into t1 values(1);
  if ($mysql_errno)
  {

mysql-test/suite/ndb_binlog/t/ndb_binlog_restart.test

@@ -246,13 +246,6 @@ connection server1;
 --echo Wait for (fast) 'server1' to complete setup and get out of read-only mode
 --source include/ndb_not_readonly.inc
 
-connection server2;
---echo Reading 'mysql.ndb_schema' on 'server2' announce schema distr. participation as a side effect.
-disable_result_log;
---error 0,ER_NO_SUCH_TABLE,ER_OPEN_AS_READONLY,ER_GET_ERRMSG,ER_TABLE_DEF_CHANGED,ER_NOT_FORM_FILE,ER_KEY_NOT_FOUND
-select * from mysql.ndb_schema where db="" and name="";
-enable_result_log;
-
 connection server1;
 --echo Create table operation on 'server1' grab MDL lock while waiting for
 --echo schema distribution to all subscribing mysqld -> stuck on 'server2'

mysql-test/suite/ndb_ddl/identifier_limits.result

@@ -5,19 +5,13 @@
 create table abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123(
 id int primary key
 ) engine=ndb;
-ERROR 42000: Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-show warnings;
-Level	Code	Message
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Error	1059	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-Error	1031	Table storage engine for 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' doesn't have this option
+drop table abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 # ############################################################
 # Bug19550973: CREATE/DROP DATABASE STATEMENT SEGFAULTS IF
 # IDENTIFIER LENGTH IS >=64
 # ############################################################
 #
 # 1. Testing schema identifier with length 63
-# NOTE! ndb_schema identifier length limit is currently 63
 #
 CREATE DATABASE
 abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz12;
@@ -30,76 +24,52 @@ DROP TABLE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz12.t1;
 DROP DATABASE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz12;
 #
 # 2. Testing schema identifier with length 64
-# NOTE! MySQL Server allows 64, but ndb_schema limit is currently 63
 #
 CREATE DATABASE
 abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
-Warnings:
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Warning	1296	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
 # Verify database existence
 USE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 # Create non NDB table
 CREATE TABLE t1 (
 a int
 );
-# Create NDB table should fail
+# Create NDB table
 CREATE TABLE t2 (
 a int
 ) ENGINE=NDB;
-ERROR 42000: Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-show warnings;
-Level	Code	Message
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Error	1059	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-Error	1031	Table storage engine for 't2' doesn't have this option
 #
-# 3. Databases with identifier length = 64 won't be replicated to other
-# MySQL Servers. Verify that the above created dabatase is not present
+# 3. Databases with identifier length = 64 is synchronized to other
+# MySQL Servers. Verify that the above created dabatase is present
 # in the other Server
+# NOTE! This testcase was fixed by BUG#27447958 which extended ndb_schema
+# to support identifiers > 63
 #
 USE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
-ERROR 42000: Unknown database 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123'
 #
 # 4. Testing alter database
 #
 ALTER DATABASE
 abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123
 character set=utf8mb4;
-Warnings:
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Warning	1296	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
 CREATE DATABASE db1;
 CREATE TABLE db1.t1 (
 a int
 ) ENGINE=NDB;
+CREATE TABLE db1.t2 (
+a int
+) ENGINE=NDB;
 #
-# 4.1 Renaming table to too long database name should fail
+# 4.1 Renaming table to long database name
 #
 ALTER TABLE db1.t1
 RENAME abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123.t3;
-ERROR 42000: Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Error	1059	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-Error	1025	Error on rename of './db1/t1' to './abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123/t3' (errno: 140 - Wrong create options)
 #
-# 4.2 Renaming table to too long table name should fail
+# 4.2 Renaming table to long table name
 #
-ALTER TABLE db1.t1
+ALTER TABLE db1.t2
 RENAME db1.abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
-ERROR 42000: Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Error	1059	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
-Error	1025	Error on rename of './db1/t1' to './db1/abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' (errno: 140 - Wrong create options)
 DROP DATABASE db1;
 DROP DATABASE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
-Warnings:
-Warning	1296	[mysql.ndb_schema] Identifier length exceeds the 63 byte limit
-Warning	1296	Identifier name 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123' is too long
 # Checking that database doesn't exists
 USE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 ERROR 42000: Unknown database 'abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123'

mysql-test/suite/ndb_ddl/identifier_limits.test

@@ -9,12 +9,10 @@
 --echo # Bug11753491: MYSQLD CRASHES WHEN CREATING A CLUSTER TABLE WITH 64
 --echo # CHARACTER TABLE NAME
 --echo # ####################################################################
---error ER_TOO_LONG_IDENT
 create table abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123(
  id int primary key
 ) engine=ndb;
-show warnings;
-
+drop table abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 
 --echo # ############################################################
 --echo # Bug19550973: CREATE/DROP DATABASE STATEMENT SEGFAULTS IF
@@ -28,7 +26,6 @@ call mtr.add_suppression("Failed to distribute");
 
 --echo #
 --echo # 1. Testing schema identifier with length 63
---echo # NOTE! ndb_schema identifier length limit is currently 63
 --echo #
 CREATE DATABASE
  abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz12;
@@ -43,7 +40,6 @@ DROP DATABASE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz12;
 
 --echo #
 --echo # 2. Testing schema identifier with length 64
---echo # NOTE! MySQL Server allows 64, but ndb_schema limit is currently 63
 --echo #
 CREATE DATABASE
  abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
@@ -54,20 +50,19 @@ USE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 CREATE TABLE t1 (
  a int
 );
---echo # Create NDB table should fail
---error ER_TOO_LONG_IDENT
+--echo # Create NDB table
 CREATE TABLE t2 (
  a int
 ) ENGINE=NDB;
-show warnings;
 
 --echo #
---echo # 3. Databases with identifier length = 64 won't be replicated to other
---echo # MySQL Servers. Verify that the above created dabatase is not present
+--echo # 3. Databases with identifier length = 64 is synchronized to other
+--echo # MySQL Servers. Verify that the above created dabatase is present
 --echo # in the other Server
+--echo # NOTE! This testcase was fixed by BUG#27447958 which extended ndb_schema
+--echo # to support identifiers > 63
 --echo #
 --connection mysqld2
---error ER_BAD_DB_ERROR
 USE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
 --connection mysqld1
 
@@ -82,26 +77,21 @@ CREATE DATABASE db1;
 CREATE TABLE db1.t1 (
  a int
 ) ENGINE=NDB;
+CREATE TABLE db1.t2 (
+ a int
+) ENGINE=NDB;
 
 --echo #
---echo # 4.1 Renaming table to too long database name should fail
+--echo # 4.1 Renaming table to long database name
 --echo #
---error ER_TOO_LONG_IDENT
 ALTER TABLE db1.t1
  RENAME abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123.t3;
-# replace win slashes since not using default database
---replace_regex /[\\]/\//
-SHOW WARNINGS;
 
 --echo #
---echo # 4.2 Renaming table to too long table name should fail
+--echo # 4.2 Renaming table to long table name
 --echo #
---error ER_TOO_LONG_IDENT
-ALTER TABLE db1.t1
+ALTER TABLE db1.t2
  RENAME db1.abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;
-# replace win slashes since not using default database
---replace_regex /[\\]/\//
-SHOW WARNINGS;
 
 DROP DATABASE db1;
 DROP DATABASE abcdefghijklmnopqrstuvwxyz1234567890bcdefghijklmnopqrstuvwxyz123;

mysql-test/suite/ndb_ddl/open_table_fail.result

@@ -0,0 +1,20 @@
+#
+# Test failure to acquire NDB_SHARE while opening table. This is an
+# unusual error condition and can thus be reproduced only with
+# error injection.
+#
+CREATE TABLE t1(
+id INT PRIMARY KEY,
+val INT
+) ENGINE=ndbcluster;
+set @save_debug = @@session.debug;
+SET SESSION debug="+d,ndb_share_acquire_fail1";
+SELECT * FROM t1;
+ERROR HY000: Got error 4009 'Cluster Failure' from NDBCLUSTER
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1296	Could not open NDB_SHARE for './test/t1'
+Error	1296	Got error 4009 'Cluster Failure' from NDBCLUSTER
+SET SESSION debug=@save_debug;
+# Cleanup and remove the table
+DROP TABLE t1;

mysql-test/suite/ndb_ddl/open_table_fail.test

@@ -0,0 +1,23 @@
+-- source include/have_ndb.inc
+-- source include/have_debug.inc
+
+--echo #
+--echo # Test failure to acquire NDB_SHARE while opening table. This is an
+--echo # unusual error condition and can thus be reproduced only with
+--echo # error injection.
+--echo #
+CREATE TABLE t1(
+ id INT PRIMARY KEY,
+ val INT
+) ENGINE=ndbcluster;
+
+set @save_debug = @@session.debug;
+# Force error to occur while opening table
+SET SESSION debug="+d,ndb_share_acquire_fail1";
+--error ER_GET_ERRMSG
+SELECT * FROM t1;
+SHOW WARNINGS;
+SET SESSION debug=@save_debug;
+
+--echo # Cleanup and remove the table
+DROP TABLE t1;

storage/ndb/plugin/ha_ndbcluster.cc

@@ -11184,13 +11184,29 @@ int ha_ndbcluster::open(const char *name, int, uint,
  return res;
  }
 
+ // Don't allow opening table unless schema distribution is ready and
+ // schema synchronization have completed. The user who wants to use
+ // this table has to wait.
+ if (ndb_binlog_is_read_only()) {
+ const Thd_ndb *thd_ndb = get_thd_ndb(thd);
+ thd_ndb->push_warning(
+ "Can't open table '%s' from NDB, schema distribution is not ready",
+ name);
+ local_close(thd, false);
+ return HA_ERR_NO_CONNECTION;
+ }
+
  // Acquire NDB_SHARE reference for handler
  m_share = NDB_SHARE::acquire_for_handler(name, this);
  if (m_share == nullptr) {
- // NOTE! This never happens, the NDB_SHARE should already have been
- // created by schema distribution or auto discovery
+ // Failed to acquire the NDB_SHARE. This is a rare case, it should already
+ // have been created when table was created, during schema synchronization
+ // or by auto discovery. Push warning explaining the problem and return a
+ // sensible error
+ const Thd_ndb *thd_ndb = get_thd_ndb(thd);
+ thd_ndb->push_warning("Could not open NDB_SHARE for '%s'", name);
  local_close(thd, false);
- return 1;
+ return HA_ERR_NO_CONNECTION;
  }
 
  // Init table lock structure
@@ -11205,10 +11221,6 @@ int ha_ndbcluster::open(const char *name, int, uint,
  local_close(thd, true);
  return res;
  }
- if (ndb_binlog_is_read_only()) {
- table->db_stat |= HA_READ_ONLY;
- ndb_log_info("table '%s' opened read only", name);
- }
  return 0;
 }
 

storage/ndb/plugin/ha_ndbcluster_binlog.cc

@@ -5337,8 +5337,7 @@ class Ndb_schema_event_handler {
  case NdbDictionary::Event::TE_DROP:
  // Cluster failure or ndb_schema_result table dropped
  if (ndb_binlog_tables_inited && ndb_binlog_running)
- ndb_log_verbose(
- 1, "NDB Binlog: NDB tables initially readonly on reconnect.");
+ ndb_log_verbose(1, "NDB Binlog: util tables need to reinitialize");
 
  // Indicate util tables not ready
  mysql_mutex_lock(&injector_data_mutex);
@@ -5412,8 +5411,7 @@ class Ndb_schema_event_handler {
  case NDBEVENT::TE_DROP:
  /* ndb_schema table DROPped */
  if (ndb_binlog_tables_inited && ndb_binlog_running)
- ndb_log_verbose(
- 1, "NDB Binlog: NDB tables initially readonly on reconnect.");
+ ndb_log_verbose(1, "NDB Binlog: util tables need to reinitialize");
 
  // Indicate util tables not ready
  mysql_mutex_lock(&injector_data_mutex);
@@ -6955,8 +6953,7 @@ static void handle_non_data_event(THD *thd, NdbEventOperation *pOp,
  case NDBEVENT::TE_DROP:
  if (ndb_apply_status_share == share) {
  if (ndb_binlog_tables_inited && ndb_binlog_running)
- ndb_log_verbose(
- 1, "NDB Binlog: NDB tables initially readonly on reconnect.");
+ ndb_log_verbose(1, "NDB Binlog: util tables need to reinitialize");
 
  /* release the ndb_apply_status_share */
  NDB_SHARE::release_reference(ndb_apply_status_share,