diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-12 12:41:19 +0300 |
| commit | 65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch) | |
| tree | 7fe642e7d6e685ed87fbd292d986b871b5e0a720 /sql/share | |
| parent | 9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff) | |
| parent | 36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff) | |
| download | mariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz | |
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index c0b3a881b8c..17192663381 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5749,8 +5749,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 "%`s.%`s contains view recursion" ger "%`s.%`s enthält View-Rekursion" |