diff options
| author | unknown <konstantin@mysql.com> | 2006-04-13 01:46:44 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-04-13 01:46:44 +0400 |
| commit | c5ed5c4b1cba6761a0f2d79d939893f028c2bd22 (patch) | |
| tree | 7b71c9c16b89ef08edc5b2f5b5f227d0b5c54d4a /sql/share | |
| parent | e46a193be82ba9956ac2db8e015fb528c84842da (diff) | |
| download | mariadb-git-c5ed5c4b1cba6761a0f2d79d939893f028c2bd22.tar.gz | |
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.
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 37487c245a9..a1f70fca8df 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5611,3 +5611,5 @@ ER_TABLE_NEEDS_UPGRADE eng "Table upgrade required. Please do \"REPAIR TABLE `%-.32s`\" to fix it!" ER_SP_NO_AGGREGATE 42000 eng "AGGREGATE is not supported for stored functions" +ER_MAX_PREPARED_STMT_COUNT_REACHED 42000 + eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)" |