Change patches

neondatabase · Dec 13, 2024 · 60cdcd1 · 60cdcd1
1 parent 80ab718
commit 60cdcd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/compute/patches/cloud_regress_pg16.patch b/compute/patches/cloud_regress_pg16.patch
@@ -981,7 +981,7 @@ index fc42d418bf..e38f517574 100644
  CREATE SCHEMA addr_nsp;
  SET search_path TO 'addr_nsp';
 diff --git a/src/test/regress/expected/password.out b/src/test/regress/expected/password.out
-index 8475231735..bb82238101 100644
+index 8475231735..be4a4e64df 100644
 --- a/src/test/regress/expected/password.out
 +++ b/src/test/regress/expected/password.out
 @@ -12,11 +12,11 @@ SET password_encryption = 'md5'; -- ok
@@ -1006,8 +1006,8 @@ index 8475231735..bb82238101 100644
  -----------------+---------------------------------------------------
 - regress_passwd1 | md5783277baca28003b33453252be4dbb34
 - regress_passwd2 | md54044304ba511dd062133eb5b4b84a2a3
-+ regress_passwd1 | NEON_MD5_PLACEHOLDER
-+ regress_passwd2 | NEON_MD5_PLACEHOLDER
++ regress_passwd1 | regress_passwd1NEON_MD5_PLACEHOLDER
++ regress_passwd2 | regress_passwd2NEON_MD5_PLACEHOLDER
   regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
 - regress_passwd4 | 
 + regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
@@ -1053,8 +1053,8 @@ index 8475231735..bb82238101 100644
  -----------------+---------------------------------------------------
 - regress_passwd1 | md5cd3578025fe2c3d7ed1b9a9b26238b70
 - regress_passwd2 | md5dfa155cadd5f4ad57860162f3fab9cdb
-+ regress_passwd1 | NEON_MD5_PLACEHOLDER
-+ regress_passwd2 | NEON_MD5_PLACEHOLDER
++ regress_passwd1 | regress_passwd1NEON_MD5_PLACEHOLDER
++ regress_passwd2 | regress_passwd2NEON_MD5_PLACEHOLDER
   regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
   regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
 - regress_passwd5 | md5e73a4b11df52a6068f8b39f90be36023

diff --git a/compute/patches/cloud_regress_pg17.patch b/compute/patches/cloud_regress_pg17.patch
@@ -1014,7 +1014,7 @@ index fc42d418bf..e38f517574 100644
  CREATE SCHEMA addr_nsp;
  SET search_path TO 'addr_nsp';
 diff --git a/src/test/regress/expected/password.out b/src/test/regress/expected/password.out
-index 924d6e001d..89bda2dcfd 100644
+index 924d6e001d..9d6383158a 100644
 --- a/src/test/regress/expected/password.out
 +++ b/src/test/regress/expected/password.out
 @@ -12,13 +12,11 @@ SET password_encryption = 'md5'; -- ok
@@ -1041,8 +1041,8 @@ index 924d6e001d..89bda2dcfd 100644
  -----------------+---------------------------------------------------
 - regress_passwd1 | md5783277baca28003b33453252be4dbb34
 - regress_passwd2 | md54044304ba511dd062133eb5b4b84a2a3
-+ regress_passwd1 | NEON_MD5_PLACEHOLDER
-+ regress_passwd2 | NEON_MD5_PLACEHOLDER
++ regress_passwd1 | regress_passwd1NEON_MD5_PLACEHOLDER
++ regress_passwd2 | regress_passwd2NEON_MD5_PLACEHOLDER
   regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
 - regress_passwd4 | 
 + regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
@@ -1088,8 +1088,8 @@ index 924d6e001d..89bda2dcfd 100644
  -----------------+---------------------------------------------------
 - regress_passwd1 | md5cd3578025fe2c3d7ed1b9a9b26238b70
 - regress_passwd2 | md5dfa155cadd5f4ad57860162f3fab9cdb
-+ regress_passwd1 | NEON_MD5_PLACEHOLDER
-+ regress_passwd2 | NEON_MD5_PLACEHOLDER
++ regress_passwd1 | regress_passwd1NEON_MD5_PLACEHOLDER
++ regress_passwd2 | regress_passwd2NEON_MD5_PLACEHOLDER
   regress_passwd3 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
   regress_passwd4 | SCRAM-SHA-256$4096:<salt>$<storedkey>:<serverkey>
 - regress_passwd5 | md5e73a4b11df52a6068f8b39f90be36023