1 files changed, 3 insertions, 3 deletions
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 4140160a93b..4cf9f07b4ba 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -792,9 +792,8 @@ bool update_sys_var_str(sys_var_str *var_str, rw_lock_t *var_mutex,
   /* If the string is "", delete old init command */
   if (var && (new_length= var->value->str_value.length()))
   {
-    if (!(res= my_strdup_with_length(var->value->str_value.ptr(),
-		     new_length,
-		     MYF(0))))
+    if (!(res= my_strdup_with_length((byte*) var->value->str_value.ptr(),
+				     new_length, MYF(0))))
       return 1;
   }
   /*
@@ -2531,6 +2530,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var)
     }
     return 0;
   }
+  value= "unknown";
 
 err:
   my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), value);