1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 87dcf361aa3..5a2a7af1ba0 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -1978,6 +1978,7 @@ public:
   */
   inline void fatal_error()
   {
+    DBUG_ASSERT(main_da.is_error());
     is_fatal_error= 1;
     DBUG_PRINT("error",("Fatal error set"));
   }
@@ -2139,7 +2140,10 @@ public:
     else
     {
       x_free(db);
-      db= new_db ? my_strndup(new_db, new_db_len, MYF(MY_WME)) : NULL;
+      if (new_db)
+        db= my_strndup(new_db, new_db_len, MYF(MY_WME | ME_FATALERROR));
+      else
+        db= NULL;
     }
     db_length= db ? new_db_len : 0;
     return new_db && !db;