archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #80330: Replace language in APIs and source code/docs

Browse source 
Rename MYSQLI_REFRESH_SLAVE to MYSQLI_REFRESH_REPLICA in line with
upstream change in MySQL. The old name is retained for
backwards-compatibility reasons, and may be deprecated/removed in
the future.

Closes GH-6632.
This commit is contained in:
Darek Slusarczyk 2021-01-23 17:14:13 +01:00 • committed by Nikita Popov
parent 71301f5baf
commit ed24f0f201
6 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -18,6 +18,8 @@ PHP NEWS
- MySQLi: - MySQLi:
. Fixed bug #70372 (Emulate mysqli_fetch_all() for libmysqlclient). (Nikita) . Fixed bug #70372 (Emulate mysqli_fetch_all() for libmysqlclient). (Nikita)
. Fixed bug #80330 (Replace language in APIs and source code/docs).
(Darek Ślusarczyk)
- OpenSSL: - OpenSSL:
. Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka) . Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka)

6
UPGRADING
View file

@ -187,6 +187,12 @@ PHP 8.1 UPGRADE NOTES
10. New Global Constants 10. New Global Constants
======================================== ========================================
- MySQLi:
. MYSQLI_REFRESH_REPLICA has been added as a replacement for
MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
constant is still available for backwards-compatibility reasons, but may
be deprecated/removed in the future.
======================================== ========================================
11. Changes to INI File Handling 11. Changes to INI File Handling
======================================== ========================================

2
ext/mysqli/mysqli.c
View file

@ -805,6 +805,8 @@ PHP_MINIT_FUNCTION(mysqli)
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_HOSTS", REFRESH_HOSTS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_HOSTS", REFRESH_HOSTS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_STATUS", REFRESH_STATUS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_STATUS", REFRESH_STATUS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_THREADS", REFRESH_THREADS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_THREADS", REFRESH_THREADS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_REPLICA", REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
/* temporarily for backward compatibility */
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_SLAVE", REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_SLAVE", REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_MASTER", REFRESH_MASTER, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_MASTER", REFRESH_MASTER, CONST_CS | CONST_PERSISTENT);
#ifdef REFRESH_BACKUP_LOG #ifdef REFRESH_BACKUP_LOG

1
ext/mysqli/tests/mysqli_constants.phpt
View file

@ -93,6 +93,7 @@ mysqli.allow_local_infile=1
"MYSQLI_REFRESH_HOSTS" => true, "MYSQLI_REFRESH_HOSTS" => true,
"MYSQLI_REFRESH_STATUS" => true, "MYSQLI_REFRESH_STATUS" => true,
"MYSQLI_REFRESH_THREADS" => true, "MYSQLI_REFRESH_THREADS" => true,
"MYSQLI_REFRESH_REPLICA" => true,
"MYSQLI_REFRESH_SLAVE" => true, "MYSQLI_REFRESH_SLAVE" => true,
"MYSQLI_REFRESH_MASTER" => true, "MYSQLI_REFRESH_MASTER" => true,
"MYSQLI_DEBUG_TRACE_ENABLED" => true, "MYSQLI_DEBUG_TRACE_ENABLED" => true,

3
ext/mysqlnd/mysqlnd_enum_n_def.h
View file

@ -681,7 +681,8 @@ enum php_mysqlnd_server_command
#define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */ #define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */
#define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */ #define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */
#define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */ #define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */
#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */ #define MYSQLND_REFRESH_REPLICA 64 /* Reset master info and restart replica */
#define MYSQLND_REFRESH_SLAVE MYSQLND_REFRESH_REPLICA /* temporarily for backward compatibility */
#define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */ #define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */
#define MYSQLND_REFRESH_BACKUP_LOG 0x200000L #define MYSQLND_REFRESH_BACKUP_LOG 0x200000L

1
ext/mysqlnd/mysqlnd_libmysql_compat.h
View file

@ -125,6 +125,7 @@
#define REFRESH_STATUS MYSQLND_REFRESH_STATUS #define REFRESH_STATUS MYSQLND_REFRESH_STATUS
#define REFRESH_THREADS MYSQLND_REFRESH_THREADS #define REFRESH_THREADS MYSQLND_REFRESH_THREADS
#define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE #define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE
#define REFRESH_REPLICA MYSQLND_REFRESH_REPLICA
#define REFRESH_MASTER MYSQLND_REFRESH_MASTER #define REFRESH_MASTER MYSQLND_REFRESH_MASTER
#define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG #define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG