diff options
| author | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2005-08-19 15:29:30 -0400 |
| commit | e9c420ccf140112995ff47a03a9c41cb3b12f18f (patch) | |
| tree | df0249492ecffbc91a5e3478685c8f1ad074a428 /sql/log_event.cc | |
| parent | 141a36c31b9b9732a479f5b40a2ba35781418ad6 (diff) | |
| parent | 1b970e94e0a736a2056cb94cfcba0b50133da1d6 (diff) | |
| download | mariadb-git-e9c420ccf140112995ff47a03a9c41cb3b12f18f.tar.gz | |
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1
into mysql.com:/home/emurphy/src/work/mysql-5.0
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
include/m_ctype.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysys/charset.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
sql/item.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
strings/ctype-extra.c:
Auto merged
strings/ctype-gb2312.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-ujis.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Manual merge from 4.1
include/config-netware.h:
Manual merge from 4.1
sql/item.cc:
Manual merge from 4.1
sql/mysqld.cc:
Manual merge from 4.1
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
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) |