summaryrefslogtreecommitdiff
path: root/sql/share/norwegian-ny
diff options
context:
space:
mode:
authorbar@mysql.com <>2004-08-27 20:48:19 +0500
committerbar@mysql.com <>2004-08-27 20:48:19 +0500
commitb6041645991f23df7054f9925b150fd1fa4e8f8e (patch)
tree67e81853323170190c43b1f4547ab5c8853c78e5 /sql/share/norwegian-ny
parente8fcc297e162148d7ad6ff42258d077ace1c3304 (diff)
downloadmariadb-git-b6041645991f23df7054f9925b150fd1fa4e8f8e.tar.gz
Bug#2451 ALTER doesn't result in an error on CHARACTER SET and COLLATION conflict
Diffstat (limited to 'sql/share/norwegian-ny')
-rw-r--r--sql/share/norwegian-ny/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index b5564cb264e..ae0b307439d 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -307,3 +307,4 @@ character-set=latin1
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
"Result of %s() was larger than max_allowed_packet (%ld) - truncated"
+"Conflicting declarations: '%s' and '%s'"