archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove mysqlnd_extension enum

Browse source 
ext/mysql is no longer supported, drop handling for it from
mysqlnd.
This commit is contained in:
Nikita Popov 2020-12-15 10:55:53 +01:00
parent be4f73f328
commit 362c29241d
6 changed files with 7 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqli/mysqli.c
View file

@ -1130,7 +1130,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend
} }
} }
#else #else
mysqlnd_fetch_into(result, ((fetchtype & MYSQLI_NUM)? MYSQLND_FETCH_NUM:0) | ((fetchtype & MYSQLI_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value, MYSQLND_MYSQLI); mysqlnd_fetch_into(result, ((fetchtype & MYSQLI_NUM)? MYSQLND_FETCH_NUM:0) | ((fetchtype & MYSQLI_ASSOC)? MYSQLND_FETCH_ASSOC:0), return_value);
#endif #endif
} }
/* }}} */ /* }}} */

2
ext/mysqli/mysqli_warning.c
View file

@ -131,7 +131,7 @@ MYSQLI_WARNING * php_get_warnings(MYSQLND_CONN_DATA * mysql)
zval *entry; zval *entry;
int errno; int errno;
mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, &row, MYSQLND_MYSQLI); mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, &row);
if (Z_TYPE(row) != IS_ARRAY) { if (Z_TYPE(row) != IS_ARRAY) {
zval_ptr_dtor(&row); zval_ptr_dtor(&row);
break; break;

2
ext/mysqlnd/mysqlnd.h
View file

@ -98,7 +98,7 @@ PHPAPI MYSQLND * mysqlnd_connection_connect(MYSQLND * conn,
PHPAPI void mysqlnd_debug(const char *mode); PHPAPI void mysqlnd_debug(const char *mode);
/* Query */ /* Query */
#define mysqlnd_fetch_into(result, flags, ret_val, ext) (result)->m.fetch_into((result), (flags), (ret_val), (ext) ZEND_FILE_LINE_CC) #define mysqlnd_fetch_into(result, flags, ret_val) (result)->m.fetch_into((result), (flags), (ret_val) ZEND_FILE_LINE_CC)
#define mysqlnd_fetch_row_c(result) (result)->m.fetch_row_c((result)) #define mysqlnd_fetch_row_c(result) (result)->m.fetch_row_c((result))
#define mysqlnd_fetch_all(result, flags, return_value) (result)->m.fetch_all((result), (flags), (return_value) ZEND_FILE_LINE_CC) #define mysqlnd_fetch_all(result, flags, return_value) (result)->m.fetch_all((result), (flags), (return_value) ZEND_FILE_LINE_CC)
#define mysqlnd_get_connection_stats(conn, values) ((conn)->data)->m->get_statistics((conn)->data, (values) ZEND_FILE_LINE_CC) #define mysqlnd_get_connection_stats(conn, values) ((conn)->data)->m->get_statistics((conn)->data, (values) ZEND_FILE_LINE_CC)

6
ext/mysqlnd/mysqlnd_enum_n_def.h
View file

@ -148,12 +148,6 @@
#define TRANS_COR_RELEASE 4 #define TRANS_COR_RELEASE 4
#define TRANS_COR_NO_RELEASE 8 #define TRANS_COR_NO_RELEASE 8
typedef enum mysqlnd_extension
{
MYSQLND_MYSQL = 0,
MYSQLND_MYSQLI
} enum_mysqlnd_extension;
enum enum
{ {
MYSQLND_FETCH_ASSOC = 1, MYSQLND_FETCH_ASSOC = 1,

15
ext/mysqlnd/mysqlnd_result.c
View file

@ -1692,8 +1692,7 @@ MYSQLND_METHOD(mysqlnd_res, field_tell)(const MYSQLND_RES * const result)
/* {{{ mysqlnd_res::fetch_into */ /* {{{ mysqlnd_res::fetch_into */
static void static void
MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int flags, MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int flags,
zval *return_value, zval *return_value ZEND_FILE_LINE_DC)
enum_mysqlnd_extension extension ZEND_FILE_LINE_DC)
{ {
zend_bool fetched_anything; zend_bool fetched_anything;
unsigned int array_size; unsigned int array_size;
@ -1715,15 +1714,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_into)(MYSQLND_RES * result, const unsigned int
RETVAL_FALSE; RETVAL_FALSE;
} else if (fetched_anything == FALSE) { } else if (fetched_anything == FALSE) {
zend_array_destroy(Z_ARR_P(return_value)); zend_array_destroy(Z_ARR_P(return_value));
switch (extension) { RETVAL_NULL();
case MYSQLND_MYSQLI:
RETVAL_NULL();
break;
case MYSQLND_MYSQL:
RETVAL_FALSE;
break;
default:exit(0);
}
} }
/* /*
return_value is IS_NULL for no more data and an array for data. Thus it's ok return_value is IS_NULL for no more data and an array for data. Thus it's ok
@ -1778,7 +1769,7 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int
array_init_size(return_value, set? (unsigned int) set->row_count : 4); array_init_size(return_value, set? (unsigned int) set->row_count : 4);
do { do {
mysqlnd_fetch_into(result, flags, &row, MYSQLND_MYSQLI); mysqlnd_fetch_into(result, flags, &row);
if (Z_TYPE(row) != IS_ARRAY) { if (Z_TYPE(row) != IS_ARRAY) {
zval_ptr_dtor_nogc(&row); zval_ptr_dtor_nogc(&row);
break; break;

2
ext/mysqlnd/mysqlnd_structs.h
View file

@ -641,7 +641,7 @@ typedef enum_func_status (*func_mysqlnd_res__row_decoder)(MYSQLND_ROW_BUFFER * r
typedef MYSQLND_RES * (*func_mysqlnd_res__use_result)(MYSQLND_RES * const result, const zend_bool ps_protocol); typedef MYSQLND_RES * (*func_mysqlnd_res__use_result)(MYSQLND_RES * const result, const zend_bool ps_protocol);
typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, MYSQLND_CONN_DATA * const conn, const unsigned int flags); typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, MYSQLND_CONN_DATA * const conn, const unsigned int flags);
typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsigned int flags, zval *return_value, enum_mysqlnd_extension ext ZEND_FILE_LINE_DC); typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC);
typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result); typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result);
typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC); typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC);
typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result); typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result);