[php-src] PHP-8.6: Merge branch 'PHP-8.5' into PHP-8.6

Author: Ilia Alshanetsky (iliaal) Date: 2026-10-01T10:23:07-04:00 Commit: https://github.com/php/php-src/commit/00a29afd30842733d23b6491c8ab779921d6adc1 Raw diff: https://github.com/php/php-src/commit/00a29afd30842733d23b6491c8ab779921d6adc1.diff Merge branch 'PHP-8.5' into PHP-8.6 * PHP-8.5: ext/mysqlnd: Fix VIO plugin area getter Changed paths: M ext/mysqlnd/mysqlnd_ext_plugin.h Diff: diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h index 84cf6c004be4..033680fc4a8e 100644 --- a/ext/mysqlnd/mysqlnd_ext_plugin.h +++ b/ext/mysqlnd/mysqlnd_ext_plugin.h @@ -40,7 +40,7 @@ PHPAPI extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_ #define mysqlnd_plugin_get_plugin_stmt_data(stmt, p_id) mysqlnd_plugin_area_getters.get_stmt_area((stmt), (p_id)) #define mysqlnd_plugin_get_plugin_protocol_data(proto, p_id) mysqlnd_plugin_area_getters.get_protocol_decoder_area((proto), (p_id)) #define mysqlnd_plugin_get_plugin_pfc_data(pfc, p_id) mysqlnd_plugin_area_getters.get_pfc_area((pfc), (p_id)) -#define mysqlnd_plugin_get_plugin_vio_data(vio, p_id) mysqlnd_plugin_area_getters.get_pfc_area((vio), (p_id)) +#define mysqlnd_plugin_get_plugin_vio_data(vio, p_id) mysqlnd_plugin_area_getters.get_vio_area((vio), (p_id)) struct st_mysqlnd_plugin_methods_xetters