diff options
| author | hf@deer.(none) <> | 2003-06-04 15:12:32 +0500 |
|---|---|---|
| committer | hf@deer.(none) <> | 2003-06-04 15:12:32 +0500 |
| commit | 382aba188b6b19f7d015f873d04aad20052d9dea (patch) | |
| tree | 775e79a367ff179a835eff3dc93073d8a29ebfa4 /include | |
| parent | 70559621f2d3f0fad250db723a8aed2104d8fd76 (diff) | |
| download | mariadb-git-382aba188b6b19f7d015f873d04aad20052d9dea.tar.gz | |
SCRUM
simultaneously usable libraries
unification of client structures
Diffstat (limited to 'include')
| -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 67dc9ae08c9..65713257f0e 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -127,7 +127,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; @@ -162,7 +162,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; @@ -174,7 +174,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 }; @@ -200,7 +200,7 @@ enum mysql_rpl_type }; -#ifndef EMBEDDED_LIBRARY +#if !defined(CHECK_EMBEDDED_DIFFERENCES) || !defined(EMBEDDED_LIBRARY) typedef struct st_mysql { @@ -245,6 +245,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 bbfb869927b..1af1ed36af6 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -125,7 +125,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 */ |