Update mysqli tests to work with newer MySQL server

MaxSem · nikic · commit c639d34a6e29 · 2021-03-04T16:34:11.000+01:00
* @@session.old_passwords is present only in 5.6 and 5.7. Newer versions already behave as if they have old_passwords=2. * SET PASSWORD FOR ... = PASSWORD(...) syntax was removed in 8.0. For all affected tests, versions that don't support newer SQL are already explicitly excluded with version checks. Closes GH-6729.
diff --git a/ext/mysqli/tests/mysqli_pam_sha256.phpt b/ext/mysqli/tests/mysqli_pam_sha256.phpt
@@ -45,9 +45,8 @@ if (strlen($row['Value']) < 100) {
     die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));
 }
 
-if (!$link->query("SET @@session.old_passwords=2")) {
-    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
-}
+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7
+$link->query("SET @@session.old_passwords=2");
 
 $link->query('DROP USER shatest');
 $link->query("DROP USER shatest@localhost");
@@ -58,8 +57,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
     die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') ||
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {
     die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_ini.phpt
@@ -57,10 +57,8 @@ if (strlen($key) != fwrite($fp, $key)) {
     die(sprintf("skip Failed to create pub key file"));
 }
 
-
-if (!$link->query("SET @@session.old_passwords=2")) {
-    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
-}
+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7
+$link->query("SET @@session.old_passwords=2");
 
 $link->query('DROP USER shatest');
 $link->query("DROP USER shatest@localhost");
@@ -71,8 +69,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
     die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') ||
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {
     die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option.phpt
@@ -54,10 +54,8 @@ if (strlen($row['Value']) != fwrite($fp, $row['Value'])) {
     die(sprintf("skip Failed to create pub key file"));
 }
 
-
-if (!$link->query("SET @@session.old_passwords=2")) {
-    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
-}
+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7
+$link->query("SET @@session.old_passwords=2");
 
 $link->query('DROP USER shatest');
 $link->query("DROP USER shatest@localhost");
@@ -68,8 +66,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
     die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') ||
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {
     die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 
diff --git a/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt b/ext/mysqli/tests/mysqli_pam_sha256_public_key_option_invalid.phpt
@@ -54,10 +54,8 @@ if (strlen($row['Value']) != fwrite($fp, $row['Value'])) {
     die(sprintf("skip Failed to create pub key file"));
 }
 
-
-if (!$link->query("SET @@session.old_passwords=2")) {
-    die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));
-}
+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7
+$link->query("SET @@session.old_passwords=2");
 
 $link->query('DROP USER shatest');
 $link->query("DROP USER shatest@localhost");
@@ -68,8 +66,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') ||
     die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));
 }
 
-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') ||
-    !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {
+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') ||
+    !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {
     die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,8 @@ if (strlen($row['Value']) < 100) {`
`45`	`45`	`die(sprintf("skip Server misconfiguration? RSA pub key is suspicious, [%d] %s\n", $link->errno, $link->error));`
`46`	`46`	`}`
`47`	`47`
`48`		`-if (!$link->query("SET @@session.old_passwords=2")) {`
`49`		`- die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));`
`50`		`-}`
	`48`	`+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7`
	`49`	`+$link->query("SET @@session.old_passwords=2");`
`51`	`50`
`52`	`51`	`$link->query('DROP USER shatest');`
`53`	`52`	`$link->query("DROP USER shatest@localhost");`
`@@ -58,8 +57,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') \|\|`
`58`	`57`	`die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));`
`59`	`58`	`}`
`60`	`59`
`61`		`-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') \|\|`
`62`		`- !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {`
	`60`	`+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') \|\|`
	`61`	`+ !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {`
`63`	`62`	`die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));`
`64`	`63`	`}`
`65`	`64`
Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,8 @@ if (strlen($key) != fwrite($fp, $key)) {`
`57`	`57`	`die(sprintf("skip Failed to create pub key file"));`
`58`	`58`	`}`
`59`	`59`
`60`		`-`
`61`		`-if (!$link->query("SET @@session.old_passwords=2")) {`
`62`		`- die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));`
`63`		`-}`
	`60`	`+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7`
	`61`	`+$link->query("SET @@session.old_passwords=2");`
`64`	`62`
`65`	`63`	`$link->query('DROP USER shatest');`
`66`	`64`	`$link->query("DROP USER shatest@localhost");`
`@@ -71,8 +69,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') \|\|`
`71`	`69`	`die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));`
`72`	`70`	`}`
`73`	`71`
`74`		`-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') \|\|`
`75`		`- !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {`
	`72`	`+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') \|\|`
	`73`	`+ !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {`
`76`	`74`	`die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));`
`77`	`75`	`}`
`78`	`76`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,8 @@ if (strlen($row['Value']) != fwrite($fp, $row['Value'])) {`
`54`	`54`	`die(sprintf("skip Failed to create pub key file"));`
`55`	`55`	`}`
`56`	`56`
`57`		`-`
`58`		`-if (!$link->query("SET @@session.old_passwords=2")) {`
`59`		`- die(sprintf("skip Cannot set @@session.old_passwords=2 [%d] %s", $link->errno, $link->error));`
`60`		`-}`
	`57`	`+// Ignore errors because this variable exists only in MySQL 5.6 and 5.7`
	`58`	`+$link->query("SET @@session.old_passwords=2");`
`61`	`59`
`62`	`60`	`$link->query('DROP USER shatest');`
`63`	`61`	`$link->query("DROP USER shatest@localhost");`
`@@ -68,8 +66,8 @@ if (!$link->query('CREATE USER shatest@"%" IDENTIFIED WITH sha256_password') \|\|`
`68`	`66`	`die(sprintf("skip CREATE USER failed [%d] %s", $link->errno, $link->error));`
`69`	`67`	`}`
`70`	`68`
`71`		`-if (!$link->query('SET PASSWORD FOR shatest@"%" = PASSWORD("shatest")') \|\|`
`72`		`- !$link->query('SET PASSWORD FOR shatest@"localhost" = PASSWORD("shatest")')) {`
	`69`	`+if (!$link->query('SET PASSWORD FOR shatest@"%" = "shatest"') \|\|`
	`70`	`+ !$link->query('SET PASSWORD FOR shatest@"localhost" = "shatest"')) {`
`73`	`71`	`die(sprintf("skip SET PASSWORD failed [%d] %s", $link->errno, $link->error));`
`74`	`72`	`}`
`75`	`73`