diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_enum_n_def.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_enum_n_def.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 955eccac0e..80be26e622 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -129,6 +129,7 @@ #define CR_PARAMS_NOT_BOUND 2031 #define CR_INVALID_PARAMETER_NO 2034 #define CR_INVALID_BUFFER_USE 2035 +#define CR_LOAD_DATA_LOCAL_INFILE_REJECTED 2068 #define MYSQLND_EE_FILENOTFOUND 7890 @@ -148,12 +149,6 @@ #define TRANS_COR_RELEASE 4 #define TRANS_COR_NO_RELEASE 8 -typedef enum mysqlnd_extension -{ - MYSQLND_MYSQL = 0, - MYSQLND_MYSQLI -} enum_mysqlnd_extension; - enum { MYSQLND_FETCH_ASSOC = 1, @@ -253,10 +248,9 @@ typedef enum mysqlnd_client_option MYSQL_OPT_NET_BUFFER_LENGTH, MYSQL_OPT_TLS_VERSION, MYSQL_OPT_SSL_MODE, + MYSQL_OPT_LOAD_DATA_LOCAL_DIR, MYSQLND_DEPRECATED_ENUM1 = 200, -#ifdef MYSQLND_STRING_TO_INT_CONVERSION MYSQLND_OPT_INT_AND_FLOAT_NATIVE = 201, -#endif MYSQLND_OPT_NET_CMD_BUFFER_SIZE = 202, MYSQLND_OPT_NET_READ_BUFFER_SIZE = 203, MYSQLND_OPT_SSL_KEY = 204, @@ -689,23 +683,12 @@ enum php_mysqlnd_server_command #define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */ #define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */ #define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */ -#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */ +#define MYSQLND_REFRESH_REPLICA 64 /* Reset master info and restart replica */ +#define MYSQLND_REFRESH_SLAVE MYSQLND_REFRESH_REPLICA /* temporarily for backward compatibility */ #define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */ #define MYSQLND_REFRESH_BACKUP_LOG 0x200000L -#define MYSQLND_STORE_PS 1 -#define MYSQLND_STORE_NO_COPY 2 -#define MYSQLND_STORE_COPY 4 - -enum mysqlnd_buffered_type -{ - MYSQLND_BUFFERED_TYPE_ZVAL = 1, - MYSQLND_BUFFERED_TYPE_C -}; - - #define MYSQLND_CLIENT_NO_FLAG 0 -#define MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA 1 #endif /* MYSQLND_ENUM_N_DEF_H */ |