diff --git a/mysql-test/r/shutdown.result b/mysql-test/r/shutdown.result
index fae3af1cd08..7039afb129e 100644
--- a/mysql-test/r/shutdown.result
+++ b/mysql-test/r/shutdown.result
@@ -1,5 +1,7 @@
 create user user1@localhost;
 shutdown;
 ERROR 42000: Access denied; you need (at least one of) the SHUTDOWN privilege(s) for this operation
+create procedure try_shutdown() shutdown;
+drop procedure try_shutdown;
 shutdown;
 drop user user1@localhost;
diff --git a/mysql-test/t/shutdown.test b/mysql-test/t/shutdown.test
index c44eb44ed8b..ac7f06b116d 100644
--- a/mysql-test/t/shutdown.test
+++ b/mysql-test/t/shutdown.test
@@ -13,6 +13,9 @@ connection default;
 disconnect c1;
 --connect (c1,localhost,root,,)
 
+create procedure try_shutdown() shutdown;
+drop procedure try_shutdown;
+
 --let $_server_id= `SELECT @@server_id`
 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.$_server_id.expect
 --exec echo "wait" > $_expect_file_name
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index e6c2b09cb3d..52f54687266 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -955,10 +955,10 @@ bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %parse-param { THD *thd }
 %lex-param { THD *thd }
 /*
-  Currently there are 186 shift/reduce conflicts.
+  Currently there are 164 shift/reduce conflicts.
   We should not introduce new conflicts any more.
 */
-%expect 186
+%expect 164
 
 /*
    Comments for TOKENS.
@@ -14005,6 +14005,7 @@ keyword:
         | SAVEPOINT_SYM         {}
         | SECURITY_SYM          {}
         | SERVER_SYM            {}
+        | SHUTDOWN              {}
         | SIGNED_SYM            {}
         | SOCKET_SYM            {}
         | SLAVE                 {}
@@ -14275,7 +14276,6 @@ keyword_sp:
         | SESSION_SYM              {}
         | SIMPLE_SYM               {}
         | SHARE_SYM                {}
-        | SHUTDOWN                 {}
         | SLAVE_POS_SYM            {}
         | SLOW                     {}
         | SNAPSHOT_SYM             {}