Declare MYSQLI_IS_MARIADB as always false

kocsismate · kocsismate · commit f99d37ba6b72 · 2022-07-18T08:56:45.000+02:00
diff --git a/ext/mysqli/mysqli.stub.php b/ext/mysqli/mysqli.stub.php
@@ -614,7 +614,7 @@
  * @var bool
  * @cname MYSQLI_IS_MARIADB
  */
-const MYSQLI_IS_MARIADB = UNKNOWN;
+const MYSQLI_IS_MARIADB = false;
 
 final class mysqli_driver
 {
diff --git a/ext/mysqli/mysqli_arginfo.h b/ext/mysqli/mysqli_arginfo.h
diff --git a/ext/mysqli/mysqli_priv.h b/ext/mysqli/mysqli_priv.h
@@ -107,12 +107,6 @@ PHP_MYSQLI_EXPORT(zend_object *) mysqli_objects_new(zend_class_entry *);
 #define MYSQLI_REPORT_CLOSE			8
 #define MYSQLI_REPORT_ALL		  255
 
-#ifdef MARIADB_BASE_VERSION
-#define MYSQLI_IS_MARIADB 1
-#else
-#define MYSQLI_IS_MARIADB 0
-#endif
-
 #define MYSQLI_REPORT_MYSQL_ERROR(mysql) \
 if ((MyG(report_mode) & MYSQLI_REPORT_ERROR) && mysql_errno(mysql)) { \
 	php_mysqli_report_error(mysql_sqlstate(mysql), mysql_errno(mysql), mysql_error(mysql)); \

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@`
`614`	`614`	`* @var bool`
`615`	`615`	`* @cname MYSQLI_IS_MARIADB`
`616`	`616`	`*/`
`617`		`-const MYSQLI_IS_MARIADB = UNKNOWN;`
	`617`	`+const MYSQLI_IS_MARIADB = false;`
`618`	`618`
`619`	`619`	`final class mysqli_driver`
`620`	`620`	`{`