summaryrefslogtreecommitdiff
path: root/sql/log_event.h
diff options
context:
space:
mode:
authorunknown <elliot@mysql.com>2005-08-19 14:49:34 -0400
committerunknown <elliot@mysql.com>2005-08-19 14:49:34 -0400
commit1b970e94e0a736a2056cb94cfcba0b50133da1d6 (patch)
treee9b004d2e9d0b322b3e2006b7e0e0733ea5d65f9 /sql/log_event.h
parent496e86da3a2b0019a3d9c186063e2c4f56b2bb44 (diff)
downloadmariadb-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.h')
-rw-r--r--sql/log_event.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h
index 7ae4e863fc2..5c81d0c92f0 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -1069,5 +1069,5 @@ public:
bool is_valid() { return 1; }
};
#endif
-
+char *str_to_hex(char *to, const char *from, uint len);
#endif /* _log_event_h */