Fix after manual merge.

mysql-test/r/ps.result

@@ -831,7 +831,7 @@ show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	0
 prepare stmt from "select 1";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)
 show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	0
@@ -841,7 +841,7 @@ show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	1
 prepare stmt1 from "select 1";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 1)
 show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	1
@@ -865,14 +865,14 @@ select @@max_prepared_stmt_count;
 1
 set global max_prepared_stmt_count=0;
 prepare stmt from "select 1";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)
 execute stmt;
 ERROR HY000: Unknown prepared statement handler (stmt) given to EXECUTE
 show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	0
 prepare stmt from "select 1";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 0)
 show status like 'prepared_stmt_count';
 Variable_name	Value
 Prepared_stmt_count	0
@@ -887,9 +887,9 @@ prepare stmt from "select 1";
 prepare stmt from "select 2";
 prepare stmt1 from "select 3";
 prepare stmt2 from "select 4";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 3)
 prepare stmt2 from "select 4";
-ERROR HY000: Unknown error
+ERROR 42000: Can't create more than max_prepared_stmt_count statements (current value: 3)
 select @@max_prepared_stmt_count;
 @@max_prepared_stmt_count
 3

mysql-test/t/ps.test

@@ -878,11 +878,11 @@ set global max_prepared_stmt_count=10000000000000000;
 select @@max_prepared_stmt_count;
 set global max_prepared_stmt_count=default;
 select @@max_prepared_stmt_count;
---error 1229 # ER_GLOBAL_VARIABLE
+--error ER_GLOBAL_VARIABLE
 set @@max_prepared_stmt_count=1;
---error 1229 # ER_GLOBAL_VARIABLE
+--error ER_GLOBAL_VARIABLE
 set max_prepared_stmt_count=1;
---error 1229 # ER_GLOBAL_VARIABLE
+--error ER_GLOBAL_VARIABLE
 set local max_prepared_stmt_count=1;
 # set to a reasonable limit works
 set global max_prepared_stmt_count=1;
@@ -893,13 +893,13 @@ select @@max_prepared_stmt_count;
 set global max_prepared_stmt_count=0;
 select @@max_prepared_stmt_count;
 show status like 'prepared_stmt_count';
---error 1105 # ER_UNKNOWN_ERROR
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED
 prepare stmt from "select 1";
 show status like 'prepared_stmt_count';
 set global max_prepared_stmt_count=1;
 prepare stmt from "select 1";
 show status like 'prepared_stmt_count';
---error 1105 # ER_UNKNOWN_ERROR
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED
 prepare stmt1 from "select 1";
 show status like 'prepared_stmt_count';
 deallocate prepare stmt;
@@ -919,13 +919,13 @@ show status like 'prepared_stmt_count';
 show status like 'prepared_stmt_count';
 select @@max_prepared_stmt_count;
 set global max_prepared_stmt_count=0;
---error 1105 # ER_UNKNOWN_ERROR
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED
 prepare stmt from "select 1";
 # Result: the old statement is deallocated, the new is not created.
---error 1243 # ER_UNKNOWN_STMT_HANDLER
+--error ER_UNKNOWN_STMT_HANDLER
 execute stmt;
 show status like 'prepared_stmt_count';
---error 1105 # ER_UNKNOWN_ERROR
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED
 prepare stmt from "select 1";
 show status like 'prepared_stmt_count';
 #
@@ -940,10 +940,10 @@ connect (con1,localhost,root,,);
 connection con1;
 prepare stmt from "select 2";
 prepare stmt1 from "select 3";
---error 1105 # ER_UNKNOWN_ERROR
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED
 prepare stmt2 from "select 4";
 connection default;
---error 1105 # ER_UNKNOWN_ERROR 
+--error ER_MAX_PREPARED_STMT_COUNT_REACHED 
 prepare stmt2 from "select 4";
 select @@max_prepared_stmt_count;
 show status like 'prepared_stmt_count';