summaryrefslogtreecommitdiff
path: root/sql/share/greek
diff options
context:
space:
mode:
authorunknown <bell@laptop.sanja.is.com.ua>2003-08-26 16:49:53 +0300
committerunknown <bell@laptop.sanja.is.com.ua>2003-08-26 16:49:53 +0300
commit97354d0699a856a62e7be862b82c0fb055c0f3cc (patch)
tree522f1942c7611bf393256138eff2346821b3e1f1 /sql/share/greek
parent7ec21e9fc4d2311a421f3a4a9c726e394327910b (diff)
parent3b799e8fd8eb13c7ad6e2bb01a922e37d9101ea7 (diff)
downloadmariadb-git-97354d0699a856a62e7be862b82c0fb055c0f3cc.tar.gz
merge
sql/item.cc: Auto merged
Diffstat (limited to 'sql/share/greek')
-rw-r--r--sql/share/greek/errmsg.txt12
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index d1a69677c81..f52987e56cf 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -45,8 +45,8 @@
"Πρόβλημα με τη διαθέσιμη μνήμη (Out of thread space/memory)",
"Δεν έγινε γνωστό το hostname για την address σας",
"Η αναγνώριση (handshake) δεν έγινε σωστά",
-"Δεν επιτέρεται η πρόσβαση στο χρήστη: '%-.32s@%-.64s' στη βάση δεδομένων '%-.64s'",
-"Δεν επιτέρεται η πρόσβαση στο χρήστη: '%-.32s@%-.64s' (χρήση password: %s)",
+"Δεν επιτέρεται η πρόσβαση στο χρήστη: '%-.32s'@'%-.64s' στη βάση δεδομένων '%-.64s'",
+"Δεν επιτέρεται η πρόσβαση στο χρήστη: '%-.32s'@'%-.64s' (χρήση password: %s)",
"Δεν επιλέχθηκε βάση δεδομένων",
"Αγνωστη εντολή",
"Το πεδίο '%-.64s' δεν μπορεί να είναι κενό (null)",
@@ -143,8 +143,8 @@
"Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
"There is no such grant defined for user '%-.32s' on host '%-.64s'",
-"%-.16s command denied to user: '%-.32s@%-.64s' for table '%-.64s'",
-"%-.16s command denied to user: '%-.32s@%-.64s' for column '%-.64s' in table '%-.64s'",
+"%-.16s command denied to user: '%-.32s'@'%-.64s' for table '%-.64s'",
+"%-.16s command denied to user: '%-.32s'@'%-.64s' for column '%-.64s' in table '%-.64s'",
"Illegal GRANT/REVOKE command. Please consult the manual which privileges can be used.",
"The host or user argument to GRANT is too long",
"Table '%-.64s.%-.64s' doesn't exist",
@@ -212,7 +212,7 @@
"DROP DATABASE not allowed while thread is holding global read lock",
"CREATE DATABASE not allowed while thread is holding global read lock",
"Wrong arguments to %s",
-"%-.32s@%-.64s is not allowed to create new users",
+"'%-.32s'@'%-.64s' is not allowed to create new users",
"Incorrect table definition; all MERGE tables must be in the same database",
"Deadlock found when trying to get lock; Try restarting transaction",
"The used table type doesn't support FULLTEXT indexes",
@@ -238,6 +238,7 @@
"Wrong usage/placement of '%s'",
"This version of MySQL doesn't yet support '%s'",
"Got fatal error %d: '%-.128s' from master when reading data from binary log",
+"Slave SQL thread ignored the query because of replicate-*-table rules",
"Wrong foreign key definition for '%-.64s': %s",
"Key reference and table reference doesn't match",
"Cardinality error (more/less than %d columns)",
@@ -267,4 +268,5 @@
"Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'",
"Illegal mix of collations for operation '%s'",
"Variable '%-.64s' is not a variable component (Can't be used as XXXX.variable_name)",
+"Unknown collation: '%-.64s'",
"Field or reference '%-.64s%s%-.64s%s%-.64s' of SELECT #%d was resolved in SELECT #%d",