summaryrefslogtreecommitdiff
path: root/sql/share/norwegian-ny
diff options
context:
space:
mode:
authorunknown <paul@teton.kitebird.com>2004-01-26 12:45:42 -0600
committerunknown <paul@teton.kitebird.com>2004-01-26 12:45:42 -0600
commit357b2ceb9b1c929667036139a5ebbd3b51934fcc (patch)
tree019c4a54da84b805fa43d5650d2916fc265818a2 /sql/share/norwegian-ny
parent3647cee5cb1c00ed18139d3e801178322baa3b13 (diff)
parent01d42f79e6b9363ffa42e4314a6b9812bc306ed5 (diff)
downloadmariadb-git-357b2ceb9b1c929667036139a5ebbd3b51934fcc.tar.gz
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1 sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
Diffstat (limited to 'sql/share/norwegian-ny')
-rw-r--r--sql/share/norwegian-ny/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 9aa0253c884..da906acc34f 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -293,3 +293,5 @@ character-set=latin1
"Unknown table engine '%s'",
"'%s' is deprecated. Use '%s' instead.",
"The target table %-.100s of the %s is not updatable.",
+"The '%s' feature was disabled. You need MySQL built with '%s' define to have it working"
+"MySQL is started in --skip-grant-tables mode. You can't use this command"