summaryrefslogtreecommitdiff
path: root/sql/share/errmsg-utf8.txt
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-07 17:11:22 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-07 17:11:22 +0300
commit4c89cff5582e786d1cde40b75c2290c136e64e31 (patch)
tree098edebe3e6e97ca234bf8842580851f807cd57a /sql/share/errmsg-utf8.txt
parent4ede2fec4cb7165a469776bfdbf247db86acb297 (diff)
parent400a8eb60f832030a04a248e2c96552aa3f44055 (diff)
downloadmariadb-git-4c89cff5582e786d1cde40b75c2290c136e64e31.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/share/errmsg-utf8.txt')
-rw-r--r--sql/share/errmsg-utf8.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index 52be5e14e14..d73a22c80dc 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -5577,8 +5577,8 @@ ER_SP_NO_AGGREGATE 42000
eng "AGGREGATE is not supported for stored functions"
ger "AGGREGATE wird bei gespeicherten Funktionen nicht unterstützt"
ER_MAX_PREPARED_STMT_COUNT_REACHED 42000
- eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)"
- ger "Kann nicht mehr Anweisungen als max_prepared_stmt_count erzeugen (aktueller Wert: %lu)"
+ eng "Can't create more than max_prepared_stmt_count statements (current value: %u)"
+ ger "Kann nicht mehr Anweisungen als max_prepared_stmt_count erzeugen (aktueller Wert: %u)"
ER_VIEW_RECURSIVE
eng "`%-.192s`.`%-.192s` contains view recursion"
ger "`%-.192s`.`%-.192s` enthält View-Rekursion"