summaryrefslogtreecommitdiff
path: root/sql/share/norwegian/errmsg.txt
diff options
context:
space:
mode:
Diffstat (limited to 'sql/share/norwegian/errmsg.txt')
-rw-r--r--sql/share/norwegian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 0f4a0852222..2e1468bc815 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -263,3 +263,4 @@
"Z_DATA_ERROR: Input data was corrupted for zlib",
"%d line(s) was(were) cut by group_concat()",
"Using storage engine %s for table '%s'",
+"Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'",