From 5d4a4d2091084a278df36a1910a9dc014fed220b Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Sat, 2 Nov 2024 10:27:48 +0400 Subject: [PATCH] Fixing main.type_timestamp failure with --view The patch for MDEV-35250 Assertion `dec <= 6' failed in my_timestamp_binary_length added a test which depends on MDEV-29534 In view FROM_UNIXTIME adds .000000 in the result Adding --disable_view_protocol around the affected statements. --- mysql-test/main/type_timestamp.test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysql-test/main/type_timestamp.test b/mysql-test/main/type_timestamp.test index 6c7f1b9e6b1..7b273d7c2c7 100644 --- a/mysql-test/main/type_timestamp.test +++ b/mysql-test/main/type_timestamp.test @@ -1378,8 +1378,11 @@ DROP TABLE t1; --echo # SET time_zone='+00:00'; +# Disable view protocol to workaround MDEV-29534 +--disable_view_protocol SELECT FROM_UNIXTIME('1922-02-10'), BIT_AND(1); SELECT FROM_UNIXTIME('1922'), BIT_AND(1); +--enable_view_protocol # Disable PS protocol to workaround CONC-739 --disable_ps_protocol SELECT FROM_UNIXTIME('1922.1'), BIT_AND(1);