summaryrefslogtreecommitdiff
path: root/sql/share/english
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-03-03 23:07:20 +0100
committerunknown <serg@serg.mylan>2005-03-03 23:07:20 +0100
commit9210c01caca1053755476b35cf25d777ce3de7b5 (patch)
tree55707388340dadccc4056126d6e229f3d2c7791e /sql/share/english
parent560968258f615959419102de6d86707545c69655 (diff)
parent9a420a4f7b5e8d375d405f45424ee7f40b55c357 (diff)
downloadmariadb-git-9210c01caca1053755476b35cf25d777ce3de7b5.tar.gz
merge
include/my_global.h: Auto merged mysys/mf_tempfile.c: Auto merged sql/ha_myisam.cc: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged
Diffstat (limited to 'sql/share/english')
-rw-r--r--sql/share/english/errmsg.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 8ede3f61a0b..104a055417c 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -143,7 +143,7 @@ character-set=latin1
"No paths allowed for shared library",
"Function '%-.64s' already exists",
"Can't open shared library '%-.64s' (errno: %d %-.64s)",
-"Can't find function '%-.64s' in library'",
+"Can't find function '%-.64s' in library",
"Function '%-.64s' is not defined",
"Host '%-.64s' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'",
"Host '%-.64s' is not allowed to connect to this MySQL server",