Skip to content

Commit ed24f0f

Browse files
marinesovitchnikic
authored andcommitted
Fix #80330: Replace language in APIs and source code/docs
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.
1 parent 71301f5 commit ed24f0f

File tree

6 files changed

+14
-1
lines changed

6 files changed

+14
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ PHP NEWS
1818

1919
- MySQLi:
2020
. Fixed bug #70372 (Emulate mysqli_fetch_all() for libmysqlclient). (Nikita)
21+
. Fixed bug #80330 (Replace language in APIs and source code/docs).
22+
(Darek Ślusarczyk)
2123

2224
- OpenSSL:
2325
. Bump minimal OpenSSL version to 1.0.2. (Jakub Zelenka)

UPGRADING

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,12 @@ PHP 8.1 UPGRADE NOTES
187187
10. New Global Constants
188188
========================================
189189

190+
- MySQLi:
191+
. MYSQLI_REFRESH_REPLICA has been added as a replacement for
192+
MYSQLI_REFRESH_SLAVE, in line with an upstream change in MySQL. The old
193+
constant is still available for backwards-compatibility reasons, but may
194+
be deprecated/removed in the future.
195+
190196
========================================
191197
11. Changes to INI File Handling
192198
========================================

ext/mysqli/mysqli.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,8 @@ PHP_MINIT_FUNCTION(mysqli)
805805
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_HOSTS", REFRESH_HOSTS, CONST_CS | CONST_PERSISTENT);
806806
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_STATUS", REFRESH_STATUS, CONST_CS | CONST_PERSISTENT);
807807
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_THREADS", REFRESH_THREADS, CONST_CS | CONST_PERSISTENT);
808+
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_REPLICA", REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
809+
/* temporarily for backward compatibility */
808810
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_SLAVE", REFRESH_SLAVE, CONST_CS | CONST_PERSISTENT);
809811
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_MASTER", REFRESH_MASTER, CONST_CS | CONST_PERSISTENT);
810812
#ifdef REFRESH_BACKUP_LOG

ext/mysqli/tests/mysqli_constants.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ mysqli.allow_local_infile=1
9393
"MYSQLI_REFRESH_HOSTS" => true,
9494
"MYSQLI_REFRESH_STATUS" => true,
9595
"MYSQLI_REFRESH_THREADS" => true,
96+
"MYSQLI_REFRESH_REPLICA" => true,
9697
"MYSQLI_REFRESH_SLAVE" => true,
9798
"MYSQLI_REFRESH_MASTER" => true,
9899
"MYSQLI_DEBUG_TRACE_ENABLED" => true,

ext/mysqlnd/mysqlnd_enum_n_def.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@ enum php_mysqlnd_server_command
681681
#define MYSQLND_REFRESH_HOSTS 8 /* Flush host cache */
682682
#define MYSQLND_REFRESH_STATUS 16 /* Flush status variables */
683683
#define MYSQLND_REFRESH_THREADS 32 /* Flush thread cache */
684-
#define MYSQLND_REFRESH_SLAVE 64 /* Reset master info and restart slave */
684+
#define MYSQLND_REFRESH_REPLICA 64 /* Reset master info and restart replica */
685+
#define MYSQLND_REFRESH_SLAVE MYSQLND_REFRESH_REPLICA /* temporarily for backward compatibility */
685686
#define MYSQLND_REFRESH_MASTER 128 /* Remove all bin logs in the index */
686687
#define MYSQLND_REFRESH_BACKUP_LOG 0x200000L
687688

ext/mysqlnd/mysqlnd_libmysql_compat.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
#define REFRESH_STATUS MYSQLND_REFRESH_STATUS
126126
#define REFRESH_THREADS MYSQLND_REFRESH_THREADS
127127
#define REFRESH_SLAVE MYSQLND_REFRESH_SLAVE
128+
#define REFRESH_REPLICA MYSQLND_REFRESH_REPLICA
128129
#define REFRESH_MASTER MYSQLND_REFRESH_MASTER
129130
#define REFRESH_BACKUP_LOG MYSQLND_REFRESH_BACKUP_LOG
130131

0 commit comments

Comments
 (0)