"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/mysql.h" between
mariadb-connector-c-3.0.5-src.tar.gz and mariadb-connector-c-3.0.6-src.tar.gz

About: MariaDB Connector/C connects applications developed in C/C++ to MariaDB and MySQL databases.

mysql.h  (mariadb-connector-c-3.0.5-src):mysql.h  (mariadb-connector-c-3.0.6-src)
skipping to change at line 91 skipping to change at line 91
} MA_MEM_ROOT; } MA_MEM_ROOT;
#endif #endif
extern unsigned int mysql_port; extern unsigned int mysql_port;
extern char *mysql_unix_port; extern char *mysql_unix_port;
extern unsigned int mariadb_deinitialize_ssl; extern unsigned int mariadb_deinitialize_ssl;
#define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG) #define IS_PRI_KEY(n) ((n) & PRI_KEY_FLAG)
#define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG) #define IS_NOT_NULL(n) ((n) & NOT_NULL_FLAG)
#define IS_BLOB(n) ((n) & BLOB_FLAG) #define IS_BLOB(n) ((n) & BLOB_FLAG)
#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR) #define IS_NUM(t) (((t) <= MYSQL_TYPE_INT24 && (t) != MYSQL_TYPE_TIMESTAMP) || (t) == MYSQL_TYPE_YEAR || (t) == MYSQL_TYPE_NEWDECIMAL)
#define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG) #define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG)
#define INTERNAL_NUM_FIELD(f) (((f)->type <= MYSQL_TYPE_INT24 && ((f)->type != M YSQL_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == M YSQL_TYPE_YEAR || (f)->type == MYSQL_TYPE_NEWDECIMAL || (f)->type == MYSQL_TYPE_ DECIMAL) #define INTERNAL_NUM_FIELD(f) (((f)->type <= MYSQL_TYPE_INT24 && ((f)->type != M YSQL_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == M YSQL_TYPE_YEAR || (f)->type == MYSQL_TYPE_NEWDECIMAL || (f)->type == MYSQL_TYPE_ DECIMAL)
typedef struct st_mysql_field { typedef struct st_mysql_field {
char *name; /* Name of column */ char *name; /* Name of column */
char *org_name; /* Name of original column (added after 3.23.58) */ char *org_name; /* Name of original column (added after 3.23.58) */
char *table; /* Table of column if column was a field */ char *table; /* Table of column if column was a field */
char *org_table; /* Name of original table (added after 3.23.58 */ char *org_table; /* Name of original table (added after 3.23.58 */
char *db; /* table schema (added after 3.23.58) */ char *db; /* table schema (added after 3.23.58) */
char *catalog; /* table catalog (added after 3.23.58) */ char *catalog; /* table catalog (added after 3.23.58) */
skipping to change at line 127 skipping to change at line 127
enum enum_field_types type; /* Type of field. Se mysql_com.h for type s */ enum enum_field_types type; /* Type of field. Se mysql_com.h for type s */
void *extension; /* added in 4.1 */ void *extension; /* added in 4.1 */
} MYSQL_FIELD; } MYSQL_FIELD;
typedef char **MYSQL_ROW; /* return data as array of strings */ typedef char **MYSQL_ROW; /* return data as array of strings */
typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */ typedef unsigned int MYSQL_FIELD_OFFSET; /* offset to current field */
#define SET_CLIENT_ERROR(a, b, c, d) \ #define SET_CLIENT_ERROR(a, b, c, d) \
{ \ { \
(a)->net.last_errno= (b);\ (a)->net.last_errno= (b);\
strncpy((a)->net.sqlstate, (c), sizeof((a)->net.sqlstate));\ strncpy((a)->net.sqlstate, (c), SQLSTATE_LENGTH);\
strncpy((a)->net.last_error, (d) ? (d) : ER((b)), sizeof((a)->net.last_error strncpy((a)->net.last_error, (d) ? (d) : ER((b)), MYSQL_ERRMSG_SIZE - 1);\
));\
} }
/* For mysql_async.c */ /* For mysql_async.c */
#define set_mariadb_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0) #define set_mariadb_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0)
extern const char *SQLSTATE_UNKNOWN; extern const char *SQLSTATE_UNKNOWN;
#define unknown_sqlstate SQLSTATE_UNKNOWN #define unknown_sqlstate SQLSTATE_UNKNOWN
#define CLEAR_CLIENT_ERROR(a) \ #define CLEAR_CLIENT_ERROR(a) \
{ \ { \
(a)->net.last_errno= 0;\ (a)->net.last_errno= 0;\
skipping to change at line 411 skipping to change at line 411
/* Ansynchronous API constants */ /* Ansynchronous API constants */
#define MYSQL_WAIT_READ 1 #define MYSQL_WAIT_READ 1
#define MYSQL_WAIT_WRITE 2 #define MYSQL_WAIT_WRITE 2
#define MYSQL_WAIT_EXCEPT 4 #define MYSQL_WAIT_EXCEPT 4
#define MYSQL_WAIT_TIMEOUT 8 #define MYSQL_WAIT_TIMEOUT 8
typedef struct character_set typedef struct character_set
{ {
unsigned int number; /* character set number */ unsigned int number; /* character set number */
unsigned int state; /* character set state */ unsigned int state; /* character set state */
const char *csname; /* collation name */ const char *csname; /* character set name */
const char *name; /* character set name */ const char *name; /* collation name */
const char *comment; /* comment */ const char *comment; /* comment */
const char *dir; /* character set directory */ const char *dir; /* character set directory */
unsigned int mbminlen; /* min. length for multibyte strings */ unsigned int mbminlen; /* min. length for multibyte strings */
unsigned int mbmaxlen; /* max. length for multibyte strings */ unsigned int mbmaxlen; /* max. length for multibyte strings */
} MY_CHARSET_INFO; } MY_CHARSET_INFO;
/* Local infile support functions */ /* Local infile support functions */
#define LOCAL_INFILE_ERROR_LEN 512 #define LOCAL_INFILE_ERROR_LEN 512
#include "mariadb_stmt.h" #include "mariadb_stmt.h"
 End of changes. 3 change blocks. 
6 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)