summaryrefslogtreecommitdiff
path: root/sql/share/japanese
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-10-23 11:20:01 +0200
committerunknown <serg@serg.mysql.com>2001-10-23 11:20:01 +0200
commit6fec51dfba0af668582aa263f8c929236bd6ae98 (patch)
treefba4b9c9b1268d8b0cc99f5faea0594efeedaa76 /sql/share/japanese
parent825587388accab7f21fb4c117949853ad7206f73 (diff)
parentd74b5c983d978678151dec1d166e7d5668f0c808 (diff)
downloadmariadb-git-6fec51dfba0af668582aa263f8c929236bd6ae98.tar.gz
merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b: Auto merged BitKeeper/deleted/.del-violite.c~d7b85be615595ace: Auto merged sql/sql_table.cc: Auto merged sql/share/russian/errmsg.txt: merged (partially translated)
Diffstat (limited to 'sql/share/japanese')
-rw-r--r--sql/share/japanese/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index e345f462f2a..ba355c03e13 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -225,3 +225,4 @@
"Can't execute the query because you have a conflicting read lock",
"Mixing of transactional and non-transactional tables is disabled",
"Option '%s' used twice in statement",
+"The used table type doesn't support FULLTEXT indexes",