Post-merge fixes. Add a new error message for max_prepared_stmt_count

limit.


mysql-test/r/ps.result:
  Post-merge fixes.
mysql-test/t/ps.test:
  Post-merge fixes.
sql/share/errmsg.txt:
  Add a new error message for max_prepared_stmt_count limit,
  we can do it in 5.0
sql/sql_class.cc:
  Post-merge fixes.
sql/sql_class.h:
  Post-merge fixes.
sql/sql_prepare.cc:
  Post-merge fixes.

1 files changed, 6 insertions, 5 deletions

diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index 5a15e67da8e..4fa0a2dcb6e 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -1846,7 +1846,7 @@ void mysql_stmt_prepare(THD *thd, const char *packet, uint packet_length)
   if (! (stmt= new Prepared_statement(thd, &thd->protocol_prep)))
     DBUG_VOID_RETURN; /* out of memory: error is set in Sql_alloc */
 
-  if (thd->stmt_map.insert(stmt))
+  if (thd->stmt_map.insert(thd, stmt))
   {
     /*
       The error is set in the insert. The statement itself
@@ -2029,14 +2029,15 @@ void mysql_sql_stmt_prepare(THD *thd)
     DBUG_VOID_RETURN;                           /* out of memory */
   }
 
-  if (thd->stmt_map.insert(stmt))
+  /* Set the name first, insert should know that this statement has a name */
+  if (stmt->set_name(name))
   {
-    /* The statement is deleted and an error is set if insert fails */
+    delete stmt;
     DBUG_VOID_RETURN;
   }
-  if (stmt->set_name(name))
+  if (thd->stmt_map.insert(thd, stmt))
   {
-    thd->stmt_map.erase(stmt);
+    /* The statement is deleted and an error is set if insert fails */
     DBUG_VOID_RETURN;
   }