summaryrefslogtreecommitdiff
path: root/sql/share/english
diff options
context:
space:
mode:
authorunknown <bell@laptop.sanja.is.com.ua>2003-10-09 09:20:01 +0300
committerunknown <bell@laptop.sanja.is.com.ua>2003-10-09 09:20:01 +0300
commita92f47e121976ce25592661e96c3781fbc6beab5 (patch)
treec956afc640e515ff53a96984021aea69e10ae9a2 /sql/share/english
parentce85c7338ec775fb0c41e42c79200f45e3c53c6d (diff)
parentf1ff71072808e452b201b448811a0e0474510d05 (diff)
downloadmariadb-git-a92f47e121976ce25592661e96c3781fbc6beab5.tar.gz
merge
sql/set_var.cc: Auto merged
Diffstat (limited to 'sql/share/english')
-rw-r--r--sql/share/english/errmsg.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index c54f56b2529..fafc524a239 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -282,3 +282,4 @@ character-set=latin1
"Wrong parameter or combination of parameters for START SLAVE UNTIL"
"It is recommended to run with --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL, otherwise you are not safe in case of unexpected slave's mysqld restart"
"SQL thread is not to be started so UNTIL options are ignored"
+"Query cache failed to set size %lu, new query cache size is %lu",