diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
index 9640e74d453..5a95c68284c 100644
--- a/.kokoro/nightly/integration.cfg
+++ b/.kokoro/nightly/integration.cfg
@@ -13,12 +13,12 @@ env_vars: {
 # TODO: remove this after we've migrated all tests and scripts
 env_vars: {
   key: "GCLOUD_PROJECT"
-  value: "cloud-java-ci-sample"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
   key: "GOOGLE_CLOUD_PROJECT"
-  value: "cloud-java-ci-sample"
+  value: "java-docs-samples-testing"
 }
 
 env_vars: {
diff --git a/google-cloud-spanner/clirr-ignored-differences.xml b/google-cloud-spanner/clirr-ignored-differences.xml
index 5d3beb2e7b2..4b10a3bf2c9 100644
--- a/google-cloud-spanner/clirr-ignored-differences.xml
+++ b/google-cloud-spanner/clirr-ignored-differences.xml
@@ -631,4 +631,16 @@
     <className>com/google/cloud/spanner/connection/Connection</className>
     <method>void setDirectedRead(com.google.spanner.v1.DirectedReadOptions)</method>
   </difference>
+
+  <!-- Added MaxCommitDelay -->
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/connection/Connection</className>
+    <method>java.time.Duration getMaxCommitDelay()</method>
+  </difference>
+  <difference>
+    <differenceType>7012</differenceType>
+    <className>com/google/cloud/spanner/connection/Connection</className>
+    <method>void setMaxCommitDelay(java.time.Duration)</method>
+  </difference>
 </differences>
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java
index ffcef91d9c9..d43e14a177b 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/Connection.java
@@ -41,6 +41,7 @@
 import com.google.spanner.v1.DirectedReadOptions;
 import com.google.spanner.v1.ExecuteBatchDmlRequest;
 import com.google.spanner.v1.ResultSetStats;
+import java.time.Duration;
 import java.util.Iterator;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -556,6 +557,16 @@ default String getOptimizerStatisticsPackage() {
   /** @return true if this connection requests commit statistics from Cloud Spanner */
   boolean isReturnCommitStats();
 
+  /** Sets the max_commit_delay that will be applied to commit requests from this connection. */
+  default void setMaxCommitDelay(Duration maxCommitDelay) {
+    throw new UnsupportedOperationException("Unimplemented");
+  }
+
+  /** Returns the max_commit_delay that will be applied to commit requests from this connection. */
+  default Duration getMaxCommitDelay() {
+    throw new UnsupportedOperationException("Unimplemented");
+  }
+
   /**
    * Sets the priority to use for RPCs executed by this connection..
    *
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java
index 8ff367b2486..96c509a16aa 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionImpl.java
@@ -56,6 +56,7 @@
 import com.google.spanner.v1.DirectedReadOptions;
 import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions;
 import com.google.spanner.v1.ResultSetStats;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -245,6 +246,8 @@ static UnitOfWorkType of(TransactionMode transactionMode) {
   private String transactionTag;
   private String statementTag;
 
+  private Duration maxCommitDelay;
+
   /** Create a connection and register it in the SpannerPool. */
   ConnectionImpl(ConnectionOptions options) {
     Preconditions.checkNotNull(options);
@@ -273,6 +276,7 @@ static UnitOfWorkType of(TransactionMode transactionMode) {
     this.autoPartitionMode = options.isAutoPartitionMode();
     this.maxPartitions = options.getMaxPartitions();
     this.maxPartitionedParallelism = options.getMaxPartitionedParallelism();
+    this.maxCommitDelay = options.getMaxCommitDelay();
     this.ddlClient = createDdlClient();
     setDefaultTransactionOptions();
   }
@@ -791,6 +795,18 @@ public boolean isReturnCommitStats() {
     return this.returnCommitStats;
   }
 
+  @Override
+  public void setMaxCommitDelay(Duration maxCommitDelay) {
+    ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
+    this.maxCommitDelay = maxCommitDelay;
+  }
+
+  @Override
+  public Duration getMaxCommitDelay() {
+    ConnectionPreconditions.checkState(!isClosed(), CLOSED_ERROR_MSG);
+    return this.maxCommitDelay;
+  }
+
   @Override
   public void setDelayTransactionStartUntilFirstWrite(
       boolean delayTransactionStartUntilFirstWrite) {
@@ -1614,6 +1630,7 @@ UnitOfWork createNewUnitOfWork(boolean isInternalMetadataQuery) {
           .setReadOnlyStaleness(readOnlyStaleness)
           .setAutocommitDmlMode(autocommitDmlMode)
           .setReturnCommitStats(returnCommitStats)
+          .setMaxCommitDelay(maxCommitDelay)
           .setStatementTimeout(statementTimeout)
           .withStatementExecutor(statementExecutor)
           .build();
@@ -1636,6 +1653,7 @@ UnitOfWork createNewUnitOfWork(boolean isInternalMetadataQuery) {
               .setRetryAbortsInternally(retryAbortsInternally)
               .setSavepointSupport(savepointSupport)
               .setReturnCommitStats(returnCommitStats)
+              .setMaxCommitDelay(maxCommitDelay)
               .setTransactionRetryListeners(transactionRetryListeners)
               .setStatementTimeout(statementTimeout)
               .withStatementExecutor(statementExecutor)
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java
index 8bca0b2834c..de3c6ad33e2 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java
@@ -44,6 +44,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -348,6 +349,9 @@ private static String generateGuardedConnectionPropertyError(
                   ConnectionProperty.createStringProperty(
                       OPTIMIZER_STATISTICS_PACKAGE_PROPERTY_NAME, ""),
                   ConnectionProperty.createBooleanProperty("returnCommitStats", "", false),
+                  ConnectionProperty.createStringProperty(
+                      "maxCommitDelay",
+                      "The maximum commit delay in milliseconds that should be applied to commit requests from this connection."),
                   ConnectionProperty.createBooleanProperty(
                       "autoConfigEmulator",
                       "Automatically configure the connection to try to connect to the Cloud Spanner emulator (true/false). "
@@ -680,6 +684,7 @@ public static Builder newBuilder() {
   private final String userAgent;
   private final QueryOptions queryOptions;
   private final boolean returnCommitStats;
+  private final Long maxCommitDelay;
   private final boolean autoConfigEmulator;
   private final Dialect dialect;
   private final RpcPriority rpcPriority;
@@ -735,6 +740,7 @@ private ConnectionOptions(Builder builder) {
     queryOptionsBuilder.setOptimizerStatisticsPackage(parseOptimizerStatisticsPackage(this.uri));
     this.queryOptions = queryOptionsBuilder.build();
     this.returnCommitStats = parseReturnCommitStats(this.uri);
+    this.maxCommitDelay = parseMaxCommitDelay(this.uri);
     this.autoConfigEmulator = parseAutoConfigEmulator(this.uri);
     this.dialect = parseDialect(this.uri);
     this.usePlainText = this.autoConfigEmulator || parseUsePlainText(this.uri);
@@ -1051,6 +1057,27 @@ static boolean parseReturnCommitStats(String uri) {
     return Boolean.parseBoolean(value);
   }
 
+  @VisibleForTesting
+  static Long parseMaxCommitDelay(String uri) {
+    String value = parseUriProperty(uri, "maxCommitDelay");
+    try {
+      Long millis = value == null ? null : Long.valueOf(value);
+      if (millis != null && millis < 0L) {
+        throw SpannerExceptionFactory.newSpannerException(
+            ErrorCode.INVALID_ARGUMENT, "maxCommitDelay must be >=0");
+      }
+      return millis;
+    } catch (NumberFormatException numberFormatException) {
+      throw SpannerExceptionFactory.newSpannerException(
+          ErrorCode.INVALID_ARGUMENT,
+          "Invalid value for maxCommitDelay: "
+              + value
+              + "\n"
+              + "The value must be a positive integer indicating the number of "
+              + "milliseconds to use as the max delay.");
+    }
+  }
+
   static boolean parseAutoConfigEmulator(String uri) {
     String value = parseUriProperty(uri, "autoConfigEmulator");
     return Boolean.parseBoolean(value);
@@ -1382,6 +1409,11 @@ public boolean isReturnCommitStats() {
     return returnCommitStats;
   }
 
+  /** The max_commit_delay that should be applied to commit operations on this connection. */
+  public Duration getMaxCommitDelay() {
+    return maxCommitDelay == null ? null : Duration.ofMillis(maxCommitDelay);
+  }
+
   /**
    * Whether connections created by this {@link ConnectionOptions} will automatically try to connect
    * to the emulator using the default host/port of the emulator, and automatically create the
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutor.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutor.java
index 3fbc3e7a8d4..cc4c53275b3 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutor.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutor.java
@@ -82,6 +82,10 @@ interface ConnectionStatementExecutor {
 
   StatementResult statementShowReturnCommitStats();
 
+  StatementResult statementSetMaxCommitDelay(Duration maxCommitDelay);
+
+  StatementResult statementShowMaxCommitDelay();
+
   StatementResult statementSetDelayTransactionStartUntilFirstWrite(
       Boolean delayTransactionStartUntilFirstWrite);
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java
index 0e8bdada223..ec0ca4f4ac3 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java
@@ -29,6 +29,7 @@
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DEFAULT_TRANSACTION_ISOLATION;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_DIRECTED_READ;
+import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_MAX_COMMIT_DELAY;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_MAX_PARTITIONED_PARALLELISM;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_MAX_PARTITIONS;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SET_OPTIMIZER_STATISTICS_PACKAGE;
@@ -51,6 +52,7 @@
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_DATA_BOOST_ENABLED;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_DIRECTED_READ;
+import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_MAX_COMMIT_DELAY;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_MAX_PARTITIONED_PARALLELISM;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_MAX_PARTITIONS;
 import static com.google.cloud.spanner.connection.StatementResult.ClientSideStatementType.SHOW_OPTIMIZER_STATISTICS_PACKAGE;
@@ -343,6 +345,26 @@ public StatementResult statementShowReturnCommitStats() {
         SHOW_RETURN_COMMIT_STATS);
   }
 
+  @Override
+  public StatementResult statementSetMaxCommitDelay(Duration duration) {
+    getConnection()
+        .setMaxCommitDelay(
+            duration == null || duration.equals(Duration.getDefaultInstance())
+                ? null
+                : java.time.Duration.ofSeconds(duration.getSeconds(), duration.getNanos()));
+    return noResult(SET_MAX_COMMIT_DELAY);
+  }
+
+  @Override
+  public StatementResult statementShowMaxCommitDelay() {
+    return resultSet(
+        "MAX_COMMIT_DELAY",
+        getConnection().getMaxCommitDelay() == null
+            ? null
+            : getConnection().getMaxCommitDelay().toMillis() + "ms",
+        SHOW_MAX_COMMIT_DELAY);
+  }
+
   @Override
   public StatementResult statementSetDelayTransactionStartUntilFirstWrite(
       Boolean delayTransactionStartUntilFirstWrite) {
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
index 6c4290c3b18..05a8e899988 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
@@ -57,6 +57,7 @@
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.spanner.v1.SpannerGrpc;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
@@ -111,6 +112,7 @@ static class Builder extends AbstractMultiUseTransaction.Builder<Builder, ReadWr
     private Boolean retryAbortsInternally;
     private boolean delayTransactionStartUntilFirstWrite;
     private boolean returnCommitStats;
+    private Duration maxCommitDelay;
     private SavepointSupport savepointSupport;
     private List<TransactionRetryListener> transactionRetryListeners;
 
@@ -137,6 +139,11 @@ Builder setReturnCommitStats(boolean returnCommitStats) {
       return this;
     }
 
+    Builder setMaxCommitDelay(Duration maxCommitDelay) {
+      this.maxCommitDelay = maxCommitDelay;
+      return this;
+    }
+
     Builder setSavepointSupport(SavepointSupport savepointSupport) {
       this.savepointSupport = savepointSupport;
       return this;
@@ -180,6 +187,9 @@ private TransactionOption[] extractOptions(Builder builder) {
     if (builder.returnCommitStats) {
       numOptions++;
     }
+    if (builder.maxCommitDelay != null) {
+      numOptions++;
+    }
     if (this.transactionTag != null) {
       numOptions++;
     }
@@ -191,6 +201,9 @@ private TransactionOption[] extractOptions(Builder builder) {
     if (builder.returnCommitStats) {
       options[index++] = Options.commitStats();
     }
+    if (builder.maxCommitDelay != null) {
+      options[index++] = Options.maxCommitDelay(builder.maxCommitDelay);
+    }
     if (this.transactionTag != null) {
       options[index++] = Options.tag(this.transactionTag);
     }
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SingleUseTransaction.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SingleUseTransaction.java
index 56ddc16322a..164c3ae7ada 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SingleUseTransaction.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/SingleUseTransaction.java
@@ -46,12 +46,14 @@
 import com.google.cloud.spanner.Type;
 import com.google.cloud.spanner.connection.AbstractStatementParser.ParsedStatement;
 import com.google.cloud.spanner.connection.AbstractStatementParser.StatementType;
+import com.google.cloud.spanner.connection.ReadWriteTransaction.Builder;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.spanner.admin.database.v1.DatabaseAdminGrpc;
 import com.google.spanner.v1.SpannerGrpc;
+import java.time.Duration;
 import java.util.concurrent.Callable;
 
 /**
@@ -78,6 +80,7 @@ class SingleUseTransaction extends AbstractBaseUnitOfWork {
   private final TimestampBound readOnlyStaleness;
   private final AutocommitDmlMode autocommitDmlMode;
   private final boolean returnCommitStats;
+  private final Duration maxCommitDelay;
   private final boolean internalMetdataQuery;
   private volatile SettableApiFuture<Timestamp> readTimestamp = null;
   private volatile TransactionRunner writeTransaction;
@@ -92,6 +95,7 @@ static class Builder extends AbstractBaseUnitOfWork.Builder<Builder, SingleUseTr
     private TimestampBound readOnlyStaleness;
     private AutocommitDmlMode autocommitDmlMode;
     private boolean returnCommitStats;
+    private Duration maxCommitDelay;
     private boolean internalMetadataQuery;
 
     private Builder() {}
@@ -135,6 +139,11 @@ Builder setReturnCommitStats(boolean returnCommitStats) {
       return this;
     }
 
+    Builder setMaxCommitDelay(Duration maxCommitDelay) {
+      this.maxCommitDelay = maxCommitDelay;
+      return this;
+    }
+
     Builder setInternalMetadataQuery(boolean internalMetadataQuery) {
       this.internalMetadataQuery = internalMetadataQuery;
       return this;
@@ -164,6 +173,7 @@ private SingleUseTransaction(Builder builder) {
     this.readOnlyStaleness = builder.readOnlyStaleness;
     this.autocommitDmlMode = builder.autocommitDmlMode;
     this.returnCommitStats = builder.returnCommitStats;
+    this.maxCommitDelay = builder.maxCommitDelay;
     this.internalMetdataQuery = builder.internalMetadataQuery;
   }
 
@@ -467,6 +477,9 @@ private TransactionRunner createWriteTransaction() {
     if (returnCommitStats) {
       numOptions++;
     }
+    if (maxCommitDelay != null) {
+      numOptions++;
+    }
     if (numOptions == 0) {
       return dbClient.readWriteTransaction();
     }
@@ -478,6 +491,9 @@ private TransactionRunner createWriteTransaction() {
     if (returnCommitStats) {
       options[index++] = Options.commitStats();
     }
+    if (maxCommitDelay != null) {
+      options[index++] = Options.maxCommitDelay(maxCommitDelay);
+    }
     return dbClient.readWriteTransaction(options);
   }
 
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementResult.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementResult.java
index d180423266e..77f544a046f 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementResult.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementResult.java
@@ -71,6 +71,8 @@ enum ClientSideStatementType {
     SET_OPTIMIZER_STATISTICS_PACKAGE,
     SHOW_RETURN_COMMIT_STATS,
     SET_RETURN_COMMIT_STATS,
+    SHOW_MAX_COMMIT_DELAY,
+    SET_MAX_COMMIT_DELAY,
     SHOW_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE,
     SET_DELAY_TRANSACTION_START_UNTIL_FIRST_WRITE,
     SHOW_STATEMENT_TAG,
diff --git a/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/ClientSideStatements.json b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/ClientSideStatements.json
index 393e244038e..da2f79b844e 100644
--- a/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/ClientSideStatements.json
+++ b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/ClientSideStatements.json
@@ -112,6 +112,15 @@
 	  "method": "statementShowReturnCommitStats",
 	  "exampleStatements": ["show variable return_commit_stats"]
 	},
+	{
+		"name": "SHOW VARIABLE MAX_COMMIT_DELAY",
+		"executorName": "ClientSideStatementNoParamExecutor",
+		"resultType": "RESULT_SET",
+		"statementType": "SHOW_MAX_COMMIT_DELAY",
+		"regex": "(?is)\\A\\s*show\\s+variable\\s+max_commit_delay\\s*\\z",
+		"method": "statementShowMaxCommitDelay",
+		"exampleStatements": ["show variable max_commit_delay"]
+	},
 	{
 	  "name": "SHOW VARIABLE COMMIT_RESPONSE",
 	  "executorName": "ClientSideStatementNoParamExecutor",
@@ -442,6 +451,21 @@
 	    "converterName": "ClientSideStatementValueConverters$BooleanConverter"
 	  }
 	},
+	{
+		"name": "SET MAX_COMMIT_DELAY = '<duration>'|NULL",
+		"executorName": "ClientSideStatementSetExecutor",
+		"resultType": "NO_RESULT",
+		"statementType": "SET_MAX_COMMIT_DELAY",
+		"regex": "(?is)\\A\\s*set\\s+max_commit_delay\\s*(?:=)\\s*(.*)\\z",
+		"method": "statementSetMaxCommitDelay",
+		"exampleStatements": ["set max_commit_delay=null", "set max_commit_delay='1s'", "set max_commit_delay='100ms'", "set max_commit_delay='10000us'", "set max_commit_delay='9223372036854775807ns'"],
+		"setStatement": {
+			"propertyName": "MAX_COMMIT_DELAY",
+			"separator": "=",
+			"allowedValues": "('(\\d{1,19})(s|ms|us|ns)'|NULL)",
+			"converterName": "ClientSideStatementValueConverters$DurationConverter"
+		}
+	},
 	{
 	  "name": "SET STATEMENT_TAG = '<tag>'",
 	  "executorName": "ClientSideStatementSetExecutor",
diff --git a/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/PG_ClientSideStatements.json b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/PG_ClientSideStatements.json
index dcbf15c09ea..f641f7be0d9 100644
--- a/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/PG_ClientSideStatements.json
+++ b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/connection/PG_ClientSideStatements.json
@@ -112,6 +112,15 @@
       "method": "statementShowReturnCommitStats",
       "exampleStatements": ["show spanner.return_commit_stats","show variable spanner.return_commit_stats"]
     },
+    {
+      "name": "SHOW [VARIABLE] SPANNER.MAX_COMMIT_DELAY",
+      "executorName": "ClientSideStatementNoParamExecutor",
+      "resultType": "RESULT_SET",
+      "statementType": "SHOW_MAX_COMMIT_DELAY",
+      "regex": "(?is)\\A\\s*show\\s+(?:variable\\s+)?spanner\\.max_commit_delay\\s*\\z",
+      "method": "statementShowMaxCommitDelay",
+      "exampleStatements": ["show spanner.max_commit_delay", "show variable spanner.max_commit_delay"]
+    },
     {
       "name": "SHOW [VARIABLE] SPANNER.COMMIT_RESPONSE",
       "executorName": "ClientSideStatementNoParamExecutor",
@@ -608,6 +617,21 @@
         "converterName": "ClientSideStatementValueConverters$BooleanConverter"
       }
     },
+    {
+      "name": "SET SPANNER.MAX_COMMIT_DELAY =|TO '<duration>'|NULL",
+      "executorName": "ClientSideStatementSetExecutor",
+      "resultType": "NO_RESULT",
+      "statementType": "SET_MAX_COMMIT_DELAY",
+      "regex": "(?is)\\A\\s*set\\s+spanner\\.max_commit_delay(?:\\s*=\\s*|\\s+to\\s+)(.*)\\z",
+      "method": "statementSetMaxCommitDelay",
+      "exampleStatements": ["set spanner.max_commit_delay=null", "set spanner.max_commit_delay='1s'", "set spanner.max_commit_delay='100ms'", "set spanner.max_commit_delay to '10000us'", "set spanner.max_commit_delay TO '9223372036854775807ns'"],
+      "setStatement": {
+        "propertyName": "SPANNER.MAX_COMMIT_DELAY",
+        "separator": "(?:=|\\s+TO\\s+)",
+        "allowedValues": "('(\\d{1,19})(s|ms|us|ns)'|NULL)",
+        "converterName": "ClientSideStatementValueConverters$DurationConverter"
+      }
+    },
     {
       "name": "SET SPANNER.STATEMENT_TAG =|TO '<tag>'",
       "executorName": "ClientSideStatementSetExecutor",
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java
index bdca80a214d..9d319470020 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java
@@ -21,6 +21,7 @@
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
@@ -40,6 +41,7 @@
 import com.google.common.io.Files;
 import java.io.File;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
@@ -1087,4 +1089,23 @@ public void testUseVirtualGrpcTransportThreads() {
             .build()
             .isUseVirtualThreads());
   }
+
+  @Test
+  public void testMaxCommitDelay() {
+    assertNull(
+        ConnectionOptions.newBuilder()
+            .setUri(
+                "cloudspanner:/projects/test-project-123/instances/test-instance/databases/test-database")
+            .setCredentials(NoCredentials.getInstance())
+            .build()
+            .getMaxCommitDelay());
+    assertEquals(
+        Duration.ofMillis(10L),
+        ConnectionOptions.newBuilder()
+            .setUri(
+                "cloudspanner:/projects/test-project-123/instances/test-instance/databases/test-database?maxCommitDelay=10")
+            .setCredentials(NoCredentials.getInstance())
+            .build()
+            .getMaxCommitDelay());
+  }
 }
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/MaxCommitDelayTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/MaxCommitDelayTest.java
new file mode 100644
index 00000000000..1e22986cce2
--- /dev/null
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/MaxCommitDelayTest.java
@@ -0,0 +1,159 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner.connection;
+
+import static junit.framework.TestCase.assertEquals;
+
+import com.google.cloud.spanner.Dialect;
+import com.google.cloud.spanner.MockSpannerServiceImpl;
+import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.Statement;
+import com.google.common.collect.ImmutableList;
+import com.google.protobuf.Duration;
+import com.google.spanner.v1.CommitRequest;
+import java.time.temporal.ChronoUnit;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+@RunWith(Parameterized.class)
+public class MaxCommitDelayTest extends AbstractMockServerTest {
+
+  @Parameters(name = "dialect = {0}")
+  public static Collection<Object[]> data() {
+    ImmutableList.Builder<Object[]> builder = ImmutableList.builder();
+    for (Dialect dialect : Dialect.values()) {
+      builder.add(new Object[] {dialect});
+    }
+    return builder.build();
+  }
+
+  @Parameter public Dialect dialect;
+
+  private Dialect currentDialect;
+
+  @Before
+  public void setupDialect() {
+    if (currentDialect != dialect) {
+      // Reset the dialect result.
+      SpannerPool.closeSpannerPool();
+      mockSpanner.putStatementResult(
+          MockSpannerServiceImpl.StatementResult.detectDialectResult(dialect));
+      currentDialect = dialect;
+    }
+  }
+
+  private Mutation createMutation() {
+    return Mutation.newInsertBuilder("foo").set("id").to(1L).build();
+  }
+
+  private String getVariablePrefix() {
+    return dialect == Dialect.POSTGRESQL ? "spanner." : "";
+  }
+
+  @After
+  public void clearRequests() {
+    mockSpanner.clearRequests();
+  }
+
+  @Test
+  public void testNoMaxCommitDelayByDefault() {
+    try (Connection connection = createConnection()) {
+      for (boolean autocommit : new boolean[] {true, false}) {
+        connection.setAutocommit(autocommit);
+        executeCommit(connection);
+        assertMaxCommitDelay(Duration.getDefaultInstance());
+        mockSpanner.clearRequests();
+      }
+    }
+  }
+
+  @Test
+  public void testMaxCommitDelayInConnectionString() {
+    try (Connection connection = createConnection(";maxCommitDelay=1000")) {
+      for (boolean autocommit : new boolean[] {true, false}) {
+        connection.setAutocommit(autocommit);
+        executeCommit(connection);
+        assertMaxCommitDelay(Duration.newBuilder().setSeconds(1).build());
+        mockSpanner.clearRequests();
+      }
+    }
+  }
+
+  @Test
+  public void testSetMaxCommitDelay() {
+    try (Connection connection = createConnection()) {
+      for (boolean autocommit : new boolean[] {true, false}) {
+        for (boolean useSql : new boolean[] {true, false}) {
+          connection.setAutocommit(autocommit);
+
+          if (useSql) {
+            connection.execute(
+                Statement.of(String.format("set %smax_commit_delay='40ms'", getVariablePrefix())));
+          } else {
+            connection.setMaxCommitDelay(java.time.Duration.of(40_000, ChronoUnit.MICROS));
+          }
+
+          // Execute two transactions to verify that the new setting is applied to all transactions,
+          // and not only the first one that is executed after setting the max_commit_delay value.
+          Repeat.twice(
+              () -> {
+                executeCommit(connection);
+                assertMaxCommitDelay(
+                    Duration.newBuilder()
+                        .setNanos((int) TimeUnit.MILLISECONDS.toNanos(40))
+                        .build());
+                mockSpanner.clearRequests();
+              });
+
+          if (useSql) {
+            connection.execute(
+                Statement.of(String.format("set %smax_commit_delay=null", getVariablePrefix())));
+          } else {
+            connection.setMaxCommitDelay(null);
+          }
+          executeCommit(connection);
+          assertMaxCommitDelay(Duration.getDefaultInstance());
+          mockSpanner.clearRequests();
+        }
+      }
+    }
+  }
+
+  void executeCommit(Connection connection) {
+    if (connection.isAutocommit()) {
+      connection.write(createMutation());
+    } else {
+      connection.bufferedWrite(createMutation());
+      connection.commit();
+    }
+  }
+
+  private void assertMaxCommitDelay(Duration expected) {
+    List<CommitRequest> requests = mockSpanner.getRequestsOfType(CommitRequest.class);
+    assertEquals(1, requests.size());
+    CommitRequest request = requests.get(0);
+    assertEquals(expected, request.getMaxCommitDelay());
+  }
+}
diff --git a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/ConnectionImplGeneratedSqlScriptTest.sql b/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/ConnectionImplGeneratedSqlScriptTest.sql
index afd36776317..bde12f6662e 100644
--- a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/ConnectionImplGeneratedSqlScriptTest.sql
+++ b/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/ConnectionImplGeneratedSqlScriptTest.sql
@@ -160,15 +160,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:45.964000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:45.964000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:15.740000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:15.740000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:45.964000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:15.740000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -510,15 +510,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SET READ_ONLY_STALENESS='EXACT_STALENESS 10s';
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.090000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.090000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:16.217000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:16.217000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SET READ_ONLY_STALENESS='EXACT_STALENESS 10s';
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.090000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:16.217000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -950,8 +950,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 ROLLBACK;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.188000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.188000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:16.608000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:16.608000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -961,7 +961,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 ROLLBACK;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.188000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:16.608000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -1462,8 +1462,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.289000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.289000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:17.090000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:17.090000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -1473,7 +1473,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.289000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:17.090000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -1876,15 +1876,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.382000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.382000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:17.518000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:17.518000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.382000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:17.518000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2243,14 +2243,14 @@ SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.455000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:17.918000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.455000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:17.918000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2600,13 +2600,13 @@ SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.532000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:18.303000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.532000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:18.303000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2910,14 +2910,14 @@ SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.605000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.605000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:18.684000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:18.684000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.605000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:18.684000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -3246,15 +3246,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.688000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.688000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:19.116000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:19.116000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.688000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:19.116000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -3664,8 +3664,8 @@ SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 RUN BATCH;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.755000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.755000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:19.521000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:19.521000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -3674,7 +3674,7 @@ START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 RUN BATCH;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.755000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:19.521000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4083,14 +4083,14 @@ SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.825000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:19.953000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.825000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:19.953000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4440,13 +4440,13 @@ SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.881000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:20.274000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.881000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:20.274000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4880,8 +4880,8 @@ SET TRANSACTION READ ONLY;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.940000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.940000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:20.662000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:20.662000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -4891,7 +4891,7 @@ SET TRANSACTION READ ONLY;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.940000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:20.662000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -5291,15 +5291,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET TRANSACTION READ ONLY;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.009000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.009000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.051000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.051000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET TRANSACTION READ ONLY;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.009000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.051000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -5645,15 +5645,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET READ_ONLY_STALENESS='EXACT_STALENESS 10s';
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.061000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.061000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.343000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.343000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET READ_ONLY_STALENESS='EXACT_STALENESS 10s';
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.061000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.343000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -6093,8 +6093,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 ROLLBACK;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.119000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.119000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.630000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.630000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -6104,7 +6104,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 ROLLBACK;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.119000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.630000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -6613,8 +6613,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.220000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.220000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:22.181000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:22.181000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -6624,7 +6624,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.220000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:22.181000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7029,15 +7029,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.290000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.290000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:22.566000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:22.566000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.290000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:22.566000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7400,14 +7400,14 @@ SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.348000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:22.853000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.348000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:22.853000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7762,13 +7762,13 @@ SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.416000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.261000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.416000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.261000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -8082,14 +8082,14 @@ SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.475000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.475000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.615000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:23.615000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.475000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.615000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -8399,13 +8399,13 @@ SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.523000000Z';
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.894000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.523000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.894000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -8760,8 +8760,8 @@ SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SET TRANSACTION READ ONLY;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.574000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.574000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.167000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.167000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -8769,7 +8769,7 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SET TRANSACTION READ ONLY;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.574000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.167000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -9204,8 +9204,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 UPDATE foo SET bar=1;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.631000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.631000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.502000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.502000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -9213,8 +9213,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 UPDATE foo SET bar=1;
 COMMIT;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.631000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.631000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.502000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:24.502000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -9600,15 +9600,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.693000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.693000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.834000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.834000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.693000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.834000000Z';
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -9959,15 +9959,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.748000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.748000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.130000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.130000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.748000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.748000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.130000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.130000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -10327,15 +10327,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 UPDATE foo SET bar=1;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.806000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.806000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.446000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.446000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 UPDATE foo SET bar=1;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.806000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.806000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.446000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.446000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -10725,16 +10725,16 @@ SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.863000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.863000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.758000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.758000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.863000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.863000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.758000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.758000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -11117,15 +11117,15 @@ NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.924000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.924000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.062000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.062000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.924000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.924000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.062000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.062000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -11455,14 +11455,14 @@ SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.985000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.985000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.366000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.366000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.985000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.985000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.366000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.366000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=FALSE;
@@ -11785,15 +11785,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SET READ_ONLY_STALENESS='MAX_STALENESS 10s';
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.034000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.034000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.618000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.618000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SET READ_ONLY_STALENESS='MAX_STALENESS 10s';
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.034000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.034000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.618000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.618000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -12200,8 +12200,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.085000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.085000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.883000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.883000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -12209,8 +12209,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.085000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.085000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.883000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.883000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -12593,15 +12593,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.146000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.146000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.234000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.234000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.146000000Z';
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.234000000Z';
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
@@ -12939,15 +12939,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.232000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.232000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.524000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.524000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.232000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.232000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.524000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:27.524000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -13294,15 +13294,15 @@ NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.288000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.288000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.818000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.818000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.288000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.288000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.818000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:27.818000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
@@ -13619,14 +13619,14 @@ SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
-SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.341000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.341000000Z'
+SET READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:28.091000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:28.091000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
-SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.341000000Z';
-@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.341000000Z'
+SET READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:28.091000000Z';
+@EXPECT RESULT_SET 'READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:28.091000000Z'
 SHOW VARIABLE READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET READONLY=TRUE;
diff --git a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/postgresql/ConnectionImplGeneratedSqlScriptTest.sql b/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/postgresql/ConnectionImplGeneratedSqlScriptTest.sql
index 1757973f593..c64d2b6ce13 100644
--- a/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/postgresql/ConnectionImplGeneratedSqlScriptTest.sql
+++ b/google-cloud-spanner/src/test/resources/com/google/cloud/spanner/connection/postgresql/ConnectionImplGeneratedSqlScriptTest.sql
@@ -160,15 +160,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.025000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.025000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:16.008000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:16.008000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.025000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:16.008000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -510,15 +510,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SET SPANNER.READ_ONLY_STALENESS='EXACT_STALENESS 10s';
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.135000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.135000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:16.391000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:16.391000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SET SPANNER.READ_ONLY_STALENESS='EXACT_STALENESS 10s';
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.135000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:16.391000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -950,8 +950,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 ROLLBACK;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.241000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.241000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:16.882000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:16.882000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -961,7 +961,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 ROLLBACK;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.241000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:16.882000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -1462,8 +1462,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.337000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.337000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:17.326000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:17.326000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -1473,7 +1473,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.337000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:17.326000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -1876,15 +1876,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.418000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.418000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:17.672000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:17.672000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.418000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:17.672000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2243,14 +2243,14 @@ SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.494000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:18.117000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.494000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:18.117000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2600,13 +2600,13 @@ SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.568000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:18.509000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.568000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:18.509000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -2910,14 +2910,14 @@ SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.636000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.636000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:18.834000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:18.834000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.636000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:18.834000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=FALSE;
@@ -3246,15 +3246,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.718000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.718000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:19.286000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:19.286000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.718000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:19.286000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -3664,8 +3664,8 @@ SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 RUN BATCH;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.789000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.789000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:19.688000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:19.688000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -3674,7 +3674,7 @@ START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 RUN BATCH;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.789000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:19.688000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4083,14 +4083,14 @@ SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.854000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:20.139000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.854000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:20.139000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4440,13 +4440,13 @@ SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.908000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:20.445000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.908000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:20.445000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -4880,8 +4880,8 @@ SET TRANSACTION READ ONLY;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:46.975000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:46.975000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:20.850000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:20.850000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -4891,7 +4891,7 @@ SET TRANSACTION READ ONLY;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:46.975000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:20.850000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -5291,15 +5291,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET TRANSACTION READ ONLY;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.035000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.035000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.197000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.197000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET TRANSACTION READ ONLY;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.035000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.197000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -5645,15 +5645,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET SPANNER.READ_ONLY_STALENESS='EXACT_STALENESS 10s';
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.088000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.088000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.478000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.478000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SET SPANNER.READ_ONLY_STALENESS='EXACT_STALENESS 10s';
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.088000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.478000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -6093,8 +6093,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 ROLLBACK;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.171000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.171000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:21.844000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:21.844000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -6104,7 +6104,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 ROLLBACK;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.171000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:21.844000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -6613,8 +6613,8 @@ BEGIN TRANSACTION;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.258000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.258000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:22.407000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:22.407000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -6624,7 +6624,7 @@ BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.258000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:22.407000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7029,15 +7029,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.317000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.317000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:22.697000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:22.697000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.317000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:22.697000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7400,14 +7400,14 @@ SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.380000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.054000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.380000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.054000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -7762,13 +7762,13 @@ SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.447000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.432000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 SELECT 1 AS TEST;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.447000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.432000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -8082,14 +8082,14 @@ SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.499000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.499000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:23.761000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:23.761000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.499000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:23.761000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=FALSE;
@@ -8399,13 +8399,13 @@ SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.546000000Z';
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.025000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 START BATCH DDL;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.546000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.025000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -8760,8 +8760,8 @@ SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SET TRANSACTION READ ONLY;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.598000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.598000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.320000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.320000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -8769,7 +8769,7 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SET TRANSACTION READ ONLY;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.598000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.320000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -9204,8 +9204,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 UPDATE foo SET bar=1;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.664000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.664000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.676000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.676000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -9213,8 +9213,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 UPDATE foo SET bar=1;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.664000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.664000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.676000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:24.676000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -9600,15 +9600,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.717000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.717000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:24.973000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:24.973000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.717000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:24.973000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
@@ -9959,15 +9959,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.776000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.776000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.308000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.308000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 CREATE TABLE foo (id INT64 NOT NULL, name STRING(100)) PRIMARY KEY (id);
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.776000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.776000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.308000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.308000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -10327,15 +10327,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 UPDATE foo SET bar=1;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.835000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.835000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.588000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.588000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 UPDATE foo SET bar=1;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.835000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.835000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.588000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.588000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -10725,16 +10725,16 @@ SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.891000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.891000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:25.921000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:25.921000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 @EXPECT RESULT_SET 'TEST',1
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.891000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.891000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:25.921000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:25.921000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -11117,15 +11117,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:47.957000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:47.957000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.199000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.199000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:47.957000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:47.957000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.199000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.199000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -11455,14 +11455,14 @@ SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.009000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.009000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.495000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.495000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
 SET AUTOCOMMIT=TRUE;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.009000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.009000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.495000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.495000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=FALSE;
@@ -11785,15 +11785,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SET SPANNER.READ_ONLY_STALENESS='MAX_STALENESS 10s';
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.058000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.058000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:26.744000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:26.744000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SET SPANNER.READ_ONLY_STALENESS='MAX_STALENESS 10s';
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.058000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.058000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:26.744000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:26.744000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -12200,8 +12200,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.118000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.118000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.080000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.080000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -12209,8 +12209,8 @@ SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 SELECT 1 AS TEST;
 COMMIT;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.118000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.118000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.080000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:27.080000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -12593,15 +12593,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.169000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.169000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.369000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.369000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 BEGIN TRANSACTION;
 @EXPECT EXCEPTION FAILED_PRECONDITION
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.169000000Z';
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.369000000Z';
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
@@ -12939,15 +12939,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.260000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.260000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.669000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.669000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.260000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.260000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.669000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:27.669000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -13294,15 +13294,15 @@ NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.315000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.315000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:27.959000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:27.959000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
 SELECT 1 AS TEST;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.315000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.315000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:27.959000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:27.959000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
@@ -13619,14 +13619,14 @@ SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
-SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-25T15:13:48.369000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-25T15:13:48.369000000Z'
+SET SPANNER.READ_ONLY_STALENESS='READ_TIMESTAMP 2024-03-26T15:31:28.213000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','READ_TIMESTAMP 2024-03-26T15:31:28.213000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;
 SET AUTOCOMMIT=TRUE;
-SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-25T15:13:48.369000000Z';
-@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-25T15:13:48.369000000Z'
+SET SPANNER.READ_ONLY_STALENESS='MIN_READ_TIMESTAMP 2024-03-26T15:31:28.213000000Z';
+@EXPECT RESULT_SET 'SPANNER.READ_ONLY_STALENESS','MIN_READ_TIMESTAMP 2024-03-26T15:31:28.213000000Z'
 SHOW VARIABLE SPANNER.READ_ONLY_STALENESS;
 NEW_CONNECTION;
 SET SPANNER.READONLY=TRUE;