summaryrefslogtreecommitdiff
path: root/sql/share/hungarian/errmsg.txt
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-07-21 23:32:11 +0200
committerunknown <serg@serg.mylan>2004-07-21 23:32:11 +0200
commita9856042bc2955bb92da5a4b62fe5c756be84bcb (patch)
tree627d927e4e9e57f24d498a32829834b2b686e419 /sql/share/hungarian/errmsg.txt
parent3efc721a3ce0a3c68dc82166c4134d414dfcdfa8 (diff)
parent062ac038dfd9332d121287aa4b91eaff0477aa34 (diff)
downloadmariadb-git-a9856042bc2955bb92da5a4b62fe5c756be84bcb.tar.gz
merged
mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged
Diffstat (limited to 'sql/share/hungarian/errmsg.txt')
-rw-r--r--sql/share/hungarian/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index 76ae6d6606f..37fa6a86b49 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -306,6 +306,7 @@ character-set=latin2
"Unknown or incorrect time zone: '%-.64s'",
"Invalid TIMESTAMP value in column '%s' at row %ld",
"Invalid %s character string: '%.64s'",
+"Result of %s() was larger than max_allowed_packet (%d) - truncated"
"Can't create a %s from within another stored routine"
"%s %s already exists"
"%s %s does not exist"