Bug#32115887: MYSQLD ERROR DURING SERVER STARTUP: TABLE 'MYSQL.SERVER_COST' DOESN'T EXIST

Post-push fix for broken build on Sun Studio:
 >> Assertion:   (../lnk/foldconst.cc, line 3131)
    while processing sql/mysqld.cc at line 0.

Change-Id: I53e86a57db2c4675872b07695d599ea70d43f5bc

Author: Tor Didriksen

sql/mysqld.cc

@@ -6008,7 +6008,8 @@ static int init_server_components() {
    */
   init_optimizer_cost_module(true);
   {  // New scope in which the error handler hook is modified.
-    auto restore_ehh = create_scope_guard([ehh_val = error_handler_hook]() {
+    auto ehh_val = error_handler_hook;
+    auto restore_ehh = create_scope_guard([ehh_val]() {
       DBUG_ASSERT(ehh_val == my_message_stderr);
       error_handler_hook = ehh_val;
     });