diff options
| author | Anatol Belski <ab@php.net> | 2019-01-09 16:16:47 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2019-01-09 16:16:47 +0100 |
| commit | 300249226bdae069ea0d969b62a8452ce6d50933 (patch) | |
| tree | aa6eefdfa865ee05b0203e9f33c7b0f18f6f08ba | |
| parent | c4c6b80b9c2a753fa32b9475d745966eb92e17e3 (diff) | |
| parent | 7a88f89a90902c4393f96616cb86137309d173af (diff) | |
| download | php-git-300249226bdae069ea0d969b62a8452ce6d50933.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Revert visibility
| -rw-r--r-- | ext/mysqlnd/mysqlnd.h | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_loaddata.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index 401a40ebd5..7cc7cc96e6 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -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); /* LOAD DATA LOCAL */ -void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn); +PHPAPI void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn); /* Simple commands */ #define mysqlnd_autocommit(conn, mode) ((conn)->data)->m->set_autocommit((conn)->data, (mode)) diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c index 8e2bb9ed2d..a77961717d 100644 --- a/ext/mysqlnd/mysqlnd_loaddata.c +++ b/ext/mysqlnd/mysqlnd_loaddata.c @@ -123,7 +123,7 @@ void mysqlnd_local_infile_end(void * ptr) /* {{{ mysqlnd_local_infile_default */ -void +PHPAPI void mysqlnd_local_infile_default(MYSQLND_CONN_DATA * conn) { conn->infile.local_infile_init = mysqlnd_local_infile_init; |