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_unbuffered_skip_result and voidify skip_result

Browse source
This commit is contained in:
Kamil Tekiela 2021-10-21 23:12:26 +01:00
parent ad5f4715a6
commit 885dca3762
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/mysqlnd/mysqlnd.h
View file

@ -109,7 +109,6 @@ PHPAPI void mysqlnd_debug(const char *mode);
#define mysqlnd_query(conn, query_str, query_len) ((conn)->data)->m->query((conn)->data, (query_str), (query_len)) #define mysqlnd_query(conn, query_str, query_len) ((conn)->data)->m->query((conn)->data, (query_str), (query_len))
#define mysqlnd_async_query(conn, query_str, query_len) ((conn)->data)->m->send_query((conn)->data, (query_str), (query_len), NULL, NULL) #define mysqlnd_async_query(conn, query_str, query_len) ((conn)->data)->m->send_query((conn)->data, (query_str), (query_len), NULL, NULL)
#define mysqlnd_reap_async_query(conn) ((conn)->data)->m->reap_query((conn)->data) #define mysqlnd_reap_async_query(conn) ((conn)->data)->m->reap_query((conn)->data)
#define mysqlnd_unbuffered_skip_result(result) (result)->m.skip_result((result))
PHPAPI enum_func_status mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int * desc_num); PHPAPI enum_func_status mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long sec, long usec, int * desc_num);

4
ext/mysqlnd/mysqlnd_result.c
View file

@ -781,7 +781,7 @@ MYSQLND_METHOD(mysqlnd_res, store_result)(MYSQLND_RES * result,
/* {{{ mysqlnd_res::skip_result */ /* {{{ mysqlnd_res::skip_result */
static enum_func_status static void
MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result) MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result)
{ {
bool fetched_anything; bool fetched_anything;
@ -806,7 +806,7 @@ MYSQLND_METHOD(mysqlnd_res, skip_result)(MYSQLND_RES * const result)
? STAT_ROWS_SKIPPED_NORMAL : STAT_ROWS_SKIPPED_PS); ? STAT_ROWS_SKIPPED_NORMAL : STAT_ROWS_SKIPPED_PS);
} }
} }
DBG_RETURN(PASS); DBG_VOID_RETURN;
} }
/* }}} */ /* }}} */

2
ext/mysqlnd/mysqlnd_structs.h
View file

@ -632,7 +632,7 @@ typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsi
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 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);
typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result); typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result);
typedef enum_func_status (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result); typedef void (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result);
typedef enum_func_status (*func_mysqlnd_res__seek_data)(MYSQLND_RES * const result, const uint64_t row); typedef enum_func_status (*func_mysqlnd_res__seek_data)(MYSQLND_RES * const result, const uint64_t row);
typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__seek_field)(MYSQLND_RES * const result, const MYSQLND_FIELD_OFFSET field_offset); typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__seek_field)(MYSQLND_RES * const result, const MYSQLND_FIELD_OFFSET field_offset);
typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__field_tell)(const MYSQLND_RES * const result); typedef MYSQLND_FIELD_OFFSET (*func_mysqlnd_res__field_tell)(const MYSQLND_RES * const result);