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.

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

diff --git a/UPGRADING b/UPGRADING
index 4c9a1536df9a5cd9fc96d5bf9c4247b7e5442681..facdf303773b5898f97443c234c13472155fafa8 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -187,6 +187,12 @@ PHP 8.1 UPGRADE NOTES
 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
 ========================================

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index c25054788070e860fce79738daf4380e1367dc2c..a007bc0e33237f573d652c62156b87258e2a3bc8 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -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_STATUS",     REFRESH_STATUS, 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_MASTER",     REFRESH_MASTER, CONST_CS | CONST_PERSISTENT);
 #ifdef REFRESH_BACKUP_LOG

diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 22e3cd9d2ba5ee30f5790a87b945169c5fffde73..6297d56b34033f33994e150cefb265c2cae419f2 100644 (file)
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -93,6 +93,7 @@ mysqli.allow_local_infile=1
         "MYSQLI_REFRESH_HOSTS"                         => true,
         "MYSQLI_REFRESH_STATUS"                                => true,
         "MYSQLI_REFRESH_THREADS"                       => true,
+        "MYSQLI_REFRESH_REPLICA"                       => true,
         "MYSQLI_REFRESH_SLAVE"                         => true,
         "MYSQLI_REFRESH_MASTER"                                => true,
         "MYSQLI_DEBUG_TRACE_ENABLED"           => true,

diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h
index 6d6cefbb4662481d16468befa69017d0c69ec18e..b65e8523b2a85b30d17aa69ba016e541ae3af143 100644 (file)
--- a/ext/mysqlnd/mysqlnd_enum_n_def.h
+++ b/ext/mysqlnd/mysqlnd_enum_n_def.h
@@ -681,7 +681,8 @@ enum php_mysqlnd_server_command
 #define MYSQLND_REFRESH_HOSTS          8       /* Flush host cache */
 #define MYSQLND_REFRESH_STATUS         16      /* Flush status variables */
 #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_BACKUP_LOG     0x200000L
 

diff --git a/ext/mysqlnd/mysqlnd_libmysql_compat.h b/ext/mysqlnd/mysqlnd_libmysql_compat.h
index 93d229281fda2eb7dbbf4b850cb8b7f4aed38761..8782a44350c0e0b3d540ef0a7568b204024b08a5 100644 (file)
--- a/ext/mysqlnd/mysqlnd_libmysql_compat.h
+++ b/ext/mysqlnd/mysqlnd_libmysql_compat.h
@@ -125,6 +125,7 @@
 #define REFRESH_STATUS         MYSQLND_REFRESH_STATUS
 #define REFRESH_THREADS                MYSQLND_REFRESH_THREADS
 #define REFRESH_SLAVE          MYSQLND_REFRESH_SLAVE
+#define REFRESH_REPLICA                MYSQLND_REFRESH_REPLICA
 #define REFRESH_MASTER         MYSQLND_REFRESH_MASTER
 #define REFRESH_BACKUP_LOG     MYSQLND_REFRESH_BACKUP_LOG