summaryrefslogtreecommitdiff
path: root/sql/share/ukrainian/errmsg.txt
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-10-09 15:01:02 +0200
committerunknown <serg@serg.mysql.com>2001-10-09 15:01:02 +0200
commit85e02d693c10553fd15c1193865a7e6996545838 (patch)
tree3065e2b92039e911c2fc142749b31c47d64db7cd /sql/share/ukrainian/errmsg.txt
parent2204fbea330b5877a104d64a62f2fa6535833fce (diff)
parentade101ca2bf132b5eb065ef74aa574c01e202074 (diff)
downloadmariadb-git-85e02d693c10553fd15c1193865a7e6996545838.tar.gz
Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0 mysql-test/r/join.result: Auto merged mysql-test/t/join.test: Auto merged
Diffstat (limited to 'sql/share/ukrainian/errmsg.txt')
-rw-r--r--sql/share/ukrainian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 49ab4399664..80c2bcc06fb 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -227,3 +227,4 @@
"The used SELECT statements have a different number of columns",
"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",