mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2: Revert visibility
This commit is contained in:
commit
300249226b
2 changed files with 2 additions and 2 deletions
|
@ -188,7 +188,7 @@ PHPAPI void mysqlnd_free_result_bind_dtor(MYSQLND_RESULT_BIND * result_bind);
|
||||||
PHPAPI const char * mysqlnd_field_type_name(const enum mysqlnd_field_types field_type);
|
PHPAPI const char * mysqlnd_field_type_name(const enum mysqlnd_field_types field_type);
|
||||||
|
|
||||||
/* LOAD DATA LOCAL */
|
/* LOAD DATA LOCAL */
|
||||||
void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn);
|
PHPAPI void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn);
|
||||||
|
|
||||||
/* Simple commands */
|
/* Simple commands */
|
||||||
#define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode))
|
#define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode))
|
||||||
|
|
|
@ -123,7 +123,7 @@ void mysqlnd_local_infile_end(void * ptr)
|
||||||
|
|
||||||
|
|
||||||
/* {{{ mysqlnd_local_infile_default */
|
/* {{{ mysqlnd_local_infile_default */
|
||||||
void
|
PHPAPI void
|
||||||
mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn)
|
mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn)
|
||||||
{
|
{
|
||||||
conn->infile.local_infile_init = mysqlnd_local_infile_init;
|
conn->infile.local_infile_init = mysqlnd_local_infile_init;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue