summaryrefslogtreecommitdiff
path: root/mysql-test/main/perror.result
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
commit65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch)
tree7fe642e7d6e685ed87fbd292d986b871b5e0a720 /mysql-test/main/perror.result
parent9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff)
parent36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff)
downloadmariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/perror.result')
-rw-r--r--mysql-test/main/perror.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/perror.result b/mysql-test/main/perror.result
index 432a4fd4c04..46554442721 100644
--- a/mysql-test/main/perror.result
+++ b/mysql-test/main/perror.result
@@ -3,4 +3,4 @@ MySQL error code 1062 (ER_DUP_ENTRY): Duplicate entry '%-.192s' for key %d
MySQL error code 1408 (ER_STARTUP): %s: ready for connections.
Version: '%s' socket: '%s' port: %d %s
MySQL error code 1459 (ER_TABLE_NEEDS_UPGRADE): Upgrade required. Please do "REPAIR %s %`s" or dump/reload to fix it!
-MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %lu)
+MySQL error code 1461 (ER_MAX_PREPARED_STMT_COUNT_REACHED): Can't create more than max_prepared_stmt_count statements (current value: %u)