summaryrefslogtreecommitdiff
path: root/sql/share/italian
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-08-14 20:33:49 +0300
committermonty@hundin.mysql.fi <>2001-08-14 20:33:49 +0300
commit59e7c97dabb4ec2b60b994be194e9764ec16fa00 (patch)
tree63b1bcf87d376e768395f4a058416187ee0aad95 /sql/share/italian
parentcf19429793d1492af9c806132082e4f66b484fc1 (diff)
downloadmariadb-git-59e7c97dabb4ec2b60b994be194e9764ec16fa00.tar.gz
Remove warnings and portability fixes
New global read lock code Fixed bug in DATETIME with WHERE optimization Made UNION code more general.
Diffstat (limited to 'sql/share/italian')
-rw-r--r--sql/share/italian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index b0d17d2c63b..036b59fe320 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -218,3 +218,4 @@
"Error when executing command %s: %-.128s",
"Wrong usage of %s and %s",
"The used SELECT statements have a different number of columns",
+"Can't execute the query because you have a conflicting read lock",