diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
| commit | 01bcc6ed3c4c1c6515592364b4aec0cae5d2083c (patch) | |
| tree | c7d0df7f0334621904d6713b3ea5f4ba1c9cefbe /sql/log_event.cc | |
| parent | 5650719565806cfa40bb01dad34fc748a46c5c58 (diff) | |
| parent | 08797f5918915a235a3b92fa0c05ab68388c7800 (diff) | |
| download | mariadb-git-01bcc6ed3c4c1c6515592364b4aec0cae5d2083c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 8ee2f055fc6..3b92e0956ba 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -83,7 +83,7 @@ inline int ignored_error_code(int err_code) pretty_print_str() */ -#ifndef MYSQL_CLIENT +#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT) static char *pretty_print_str(char *packet, char *str, int len) { char *end= str + len; |