summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-02-16 11:41:18 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-02-16 11:41:18 +0200
commit1fd00998390a7487e42f5e29472e99354159c8bc (patch)
tree0d8d186d702341695c1ad12236b60b3d0a896354 /sql/share
parentfa5426ee469a8def705b6653cad4b9d21b4b2741 (diff)
parent345356b868d840554a8572876efc027d3ccd9842 (diff)
downloadmariadb-git-1fd00998390a7487e42f5e29472e99354159c8bc.tar.gz
Merge 10.10 into 10.11
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg-utf8.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index b76401a50e7..26cec14fd9a 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -8941,12 +8941,12 @@ ER_INVALID_DEFAULT_VALUE_FOR_FIELD 22007
hindi "गलत डिफ़ॉल्ट मान '%-.128T' कॉलम '%.192s' के लिए"
spa "Valor por defecto incorrecto '%-.128T' para columna '%.192s'"
ER_KILL_QUERY_DENIED_ERROR
- chi "你不是查询%lu的所有者"
- eng "You are not owner of query %lu"
- ger "Sie sind nicht Eigentümer von Abfrage %lu"
- hindi "आप क्वेरी %lu के OWNER नहीं हैं"
- rus "Вы не являетесь владельцем запроса %lu"
- spa "No eres el propietario de la consulta (query) %lu"
+ chi "你不是查询%lld的所有者"
+ eng "You are not owner of query %lld"
+ ger "Sie sind nicht Eigentümer von Abfrage %lld"
+ hindi "आप क्वेरी %lld के OWNER नहीं हैं"
+ rus "Вы не являетесь владельцем запроса %lld"
+ spa "No eres el propietario de la consulta (query) %lld"
ER_NO_EIS_FOR_FIELD
chi "没有收集无关的统计信息列'%s'"
eng "Engine-independent statistics are not collected for column '%s'"