summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorelliot@mysql.com <>2005-08-19 15:29:30 -0400
committerelliot@mysql.com <>2005-08-19 15:29:30 -0400
commit55b81af671d771ed9503704d45ecfc6686e7952a (patch)
treedf0249492ecffbc91a5e3478685c8f1ad074a428 /sql/log_event.cc
parent6c03c9252d1a39cf545f8043683b704c9d69b3b5 (diff)
parentd9efe655ed8f0377725ace8912f0123175d4099d (diff)
downloadmariadb-git-55b81af671d771ed9503704d45ecfc6686e7952a.tar.gz
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/work/mysql-5.0
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index bdf17ba20e3..23a301873cd 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -210,7 +210,7 @@ static inline int read_str(char **buf, char *buf_end, char **str,
/*
Transforms a string into "" or its expression in 0x... form.
*/
-static char *str_to_hex(char *to, char *from, uint len)
+char *str_to_hex(char *to, const char *from, uint len)
{
char *p= to;
if (len)