Bug#30240381 Test ndb.apply_stored_grants fails occasionally (patch #3)

When shutting down a mysql server, the test must wait not just for
clients to be disconnected, but for the server to shut down fully.

Change-Id: Ieed9fa201d420cae4cae10a47ff4a42b0d19f09e

Author: jdduncan

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

@@ -1,4 +1,3 @@
-shutdown;
 Connected to server1 as root
 CREATE DATABASE auth_test_db;
 USE auth_test_db;

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

@@ -3,14 +3,14 @@
 --source suite/ndb/include/ndb_find_tools.inc
 
 # The ACL statements here are similar to distributed_grants.test, but mysql
-# server 2 is shut down at the start of this test. When restarted, it applies
-# the whole snapshot stored in ndb_sql_metadata.
+# server 2 is shut down at the start of this test. When restarted, it will
+# apply the whole snapshot stored in ndb_sql_metadata.
 --exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.2.1.expect
 connect(mysqld2,127.0.0.1,root,,test,$MASTER_MYPORT1);
 connection mysqld2;
-shutdown;
-source include/wait_until_disconnected.inc;
 enable_reconnect;
+--shutdown_server 30
+
 connection default;
 --echo Connected to server1 as root