diff options
| author | unknown <hf@deer.(none)> | 2003-06-04 15:13:07 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-04 15:13:07 +0500 |
| commit | f6722eac25d7ef63f31e8470d8f2cbde98931026 (patch) | |
| tree | 02b1351ae6cac5c41d760b9d2b9e182e42475c92 /include/mysql_com.h | |
| parent | 020baadcfebbd0f2248d9a3fa15f29d6e9d954b4 (diff) | |
| parent | e2da9dba58db3dd0aeccadbf4c862d12f1a2c2d6 (diff) | |
| download | mariadb-git-f6722eac25d7ef63f31e8470d8f2cbde98931026.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
Diffstat (limited to 'include/mysql_com.h')
| -rw-r--r-- | include/mysql_com.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql_com.h b/include/mysql_com.h index e2fa30e3a18..0d8211106a2 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -128,7 +128,7 @@ typedef struct st_vio Vio; #define MAX_BLOB_WIDTH 8192 /* Default width for blob */ typedef struct st_net { -#ifndef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY) Vio* vio; unsigned char *buff,*buff_end,*write_pos,*read_pos; my_socket fd; /* For Perl DBI/dbd */ |