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 | |
| 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
| -rw-r--r-- | include/mysql.h | 14 | ||||
| -rw-r--r-- | include/mysql_com.h | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/mysql.h b/include/mysql.h index f57382cb6a1..becdf22067d 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -129,7 +129,7 @@ typedef struct st_mysql_data { unsigned int fields; MYSQL_ROWS *data; MEM_ROOT alloc; -#ifdef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY) MYSQL_ROWS **prev_ptr; #endif } MYSQL_DATA; @@ -164,7 +164,7 @@ struct st_mysql_options { a read that is replication-aware */ my_bool no_master_reads; -#ifdef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY) my_bool separate_thread; #endif char *shared_memory_base_name; @@ -176,7 +176,7 @@ enum mysql_option MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_COMPRESS, MYSQL_OPT_NAMED_PIPE, MYSQL_INIT_COMMAND, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP,MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_OPT_LOCAL_INFILE, MYSQL_OPT_PROTOCOL, MYSQL_SHARED_MEMORY_BASE_NAME -#ifdef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || defined(EMBEDDED_LIBRARY) , MYSQL_OPT_USE_RESULT #endif }; @@ -202,7 +202,7 @@ enum mysql_rpl_type }; -#ifndef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY) typedef struct st_mysql { @@ -247,6 +247,12 @@ typedef struct st_mysql struct st_mysql* last_used_con; LIST *stmts; /* list of all statements */ +#if !defined(CHECK_EMBEDDED_DIFFERENCES) + struct st_mysql_res *result; + void *thd; + unsigned int last_errno; + char *last_error; +#endif } MYSQL; #else 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 */ |