diff options
| author | unknown <elliot@mysql.com> | 2005-08-19 14:49:34 -0400 |
|---|---|---|
| committer | unknown <elliot@mysql.com> | 2005-08-19 14:49:34 -0400 |
| commit | 1b970e94e0a736a2056cb94cfcba0b50133da1d6 (patch) | |
| tree | e9b004d2e9d0b322b3e2006b7e0e0733ea5d65f9 /sql/log_event.cc | |
| parent | 496e86da3a2b0019a3d9c186063e2c4f56b2bb44 (diff) | |
| download | mariadb-git-1b970e94e0a736a2056cb94cfcba0b50133da1d6.tar.gz | |
Bug#11338 Fixes from review (identical functionality).
include/my_sys.h:
Fixes from review (use version in log_event.cc instead)
mysql-test/r/ctype_cp932.result:
Updated test for bug#11338 (logging of prepared statement w/ blob type)
mysql-test/t/ctype_cp932.test:
udpated test for bug#11338 (logging of prepared statement w/ blob type)
mysys/charset.c:
Fixes from review (use version in log_event.cc instead)
sql/item.cc:
Fixes from review (store character_set_client differently so that
fix can be merged forward to 5.0)
sql/item.h:
Fixes from review
sql/log_event.cc:
Fixes from review, str_to_hex is now used by item.cc
sql/log_event.h:
Added prototype for str_to_hex (now used by item.cc)
sql/sql_prepare.cc:
Fixes from review, store character_set_client differently so that
Item_param::query_val_str can use it.
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 4d260763491..66c732e8cb0 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -207,7 +207,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) |