WL#6815 Adapt MySQL Cluster to 5.7

 - WL8326 made sql_mode include NO_AUTO_CREATE_USER by default in 5.7
 - the ndb_dist_priv and ndb_rpl_dist_priv tests fail since
   they create a new user using GRANT, rewrite to explicitly
   create the new user with a CREATE USER.
 - the ndb_dist_priv test also fails on a test case
   where it checks that it's possible to create a user
   with GRANT. Keep this test until it's not supported by
   temporarily changing the sql_mode for the query.

Author: blaudden

mysql-test/suite/ndb/r/ndb_dist_priv.result

@@ -22,9 +22,8 @@ select User,Table_priv from mysql.tables_priv ORDER BY User;
 User	Table_priv
 newuser	Update
 user2	Select
+CREATE USER 'user'@'localhost';
 grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 select User,Table_priv from mysql.tables_priv ORDER BY User;
 User	Table_priv
 newuser	Update
@@ -131,9 +130,16 @@ Warning	1297	Got temporary error 274 'Time-out in NDB, probably caused by deadlo
 Error	1205	Lock wait timeout exceeded; try restarting transaction
 ROLLBACK;
 DROP USER 'billy1'@'127.0.0.1';
+set @orig_sql_mode= @@sql_mode;
+set SESSION sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 GRANT ALL ON *.* TO 'billy2'@'127.0.0.1';
 Warnings:
 Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
+set SESSION sql_mode = @orig_sql_mode;
+Warnings:
+Warning	3090	Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
 SELECT USER();
 USER()
 billy2@localhost

mysql-test/suite/ndb/t/ndb_dist_priv.test

@@ -43,6 +43,7 @@ CREATE USER 'user2'@'localhost' IDENTIFIED by 'mypass';
 GRANT SELECT ON test.t1 TO 'user2'@'localhost';
 select distinct User,Authentication_string from mysql.user order by User;
 select User,Table_priv from mysql.tables_priv ORDER BY User;
+CREATE USER 'user'@'localhost';
 grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION;
 select User,Table_priv from mysql.tables_priv ORDER BY User;
 GRANT SELECT ON test.t1 TO 'user'@'localhost';
@@ -137,7 +138,12 @@ DROP USER 'billy1'@'127.0.0.1';
 # to connect as that user on second mysqld
 #
 connection server1;
+# Remove NO_AUTO_CREATE_USER sql mode since this part of the
+# test is written to explcitly create a user with GRANT
+set @orig_sql_mode= @@sql_mode;
+set SESSION sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
 GRANT ALL ON *.* TO 'billy2'@'127.0.0.1';
+set SESSION sql_mode = @orig_sql_mode;
 
 connect (server2_as_billy2,127.0.0.1,billy2,,test,$MASTER_MYPORT1,);
 connection server2_as_billy2;

mysql-test/suite/ndb_rpl/r/ndb_rpl_dist_priv.result

@@ -26,9 +26,8 @@ select User,Table_priv from mysql.tables_priv ORDER BY User;
 User	Table_priv
 newuser	Update
 user2	Select
+CREATE USER 'user'@'localhost';
 grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION;
-Warnings:
-Warning	1287	Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
 select User,Table_priv from mysql.tables_priv ORDER BY User;
 User	Table_priv
 newuser	Update
@@ -120,6 +119,7 @@ master-bin.000001	#	Query	#	#	use `test`; RENAME USER 'user'@'localhost' TO 'new
 master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON `test`.* TO 'newuser'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*1E9649BB3F345563008E37641B407AFF50E5835C'
 master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user2'@'localhost' IDENTIFIED WITH 'mysql_native_password' AS '*6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON `test`.`t1` TO 'user2'@'localhost'
+master-bin.000001	#	Query	#	#	use `test`; CREATE USER 'user'@'localhost' IDENTIFIED WITH 'mysql_native_password' PASSWORD EXPIRE DEFAULT ACCOUNT UNLOCK
 master-bin.000001	#	Query	#	#	use `test`; GRANT ALL PRIVILEGES ON `test`.* TO 'user'@'localhost' WITH GRANT OPTION
 master-bin.000001	#	Query	#	#	use `test`; GRANT SELECT ON `test`.`t1` TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	REVOKE SELECT ON test.t1 FROM 'user'@'localhost'
@@ -139,6 +139,7 @@ master-bin.000001	#	Query	#	#	RENAME USER 'user'@'localhost' TO 'newuser'@'local
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.* TO 'newuser'@'localhost' IDENTIFIED by 'mypass2'
 master-bin.000001	#	Query	#	#	CREATE USER 'user2'@'localhost' IDENTIFIED by 'mypass'
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user2'@'localhost'
+master-bin.000001	#	Query	#	#	CREATE USER 'user'@'localhost'
 master-bin.000001	#	Query	#	#	grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES
@@ -193,6 +194,7 @@ master-bin.000001	#	Query	#	#	RENAME USER 'user'@'localhost' TO 'newuser'@'local
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.* TO 'newuser'@'localhost' IDENTIFIED by 'mypass2'
 master-bin.000001	#	Query	#	#	CREATE USER 'user2'@'localhost' IDENTIFIED by 'mypass'
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user2'@'localhost'
+master-bin.000001	#	Query	#	#	CREATE USER 'user'@'localhost'
 master-bin.000001	#	Query	#	#	grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION
 master-bin.000001	#	Query	#	#	GRANT SELECT ON test.t1 TO 'user'@'localhost'
 master-bin.000001	#	Query	#	#	use `test`; FLUSH PRIVILEGES

mysql-test/suite/ndb_rpl/t/ndb_rpl_dist_priv.test

@@ -54,6 +54,7 @@ CREATE USER 'user2'@'localhost' IDENTIFIED by 'mypass';
 GRANT SELECT ON test.t1 TO 'user2'@'localhost';
 select distinct User,Authentication_string from mysql.user order by User;
 select User,Table_priv from mysql.tables_priv ORDER BY User;
+CREATE USER 'user'@'localhost';
 grant ALL PRIVILEGES on test.* to user@localhost with GRANT OPTION;
 select User,Table_priv from mysql.tables_priv ORDER BY User;
 GRANT SELECT ON test.t1 TO 'user'@'localhost';