Merge feb77a7 into 6564a81

Author: glookka

src/datetime.cpp

@@ -127,7 +127,6 @@ static void SetTimeZoneLocal ( StrVec_t & dWarnings )
 	}
 #endif
 
-	g_hTimeZoneLocal = cctz::local_time_zone();
 	g_hTimeZone = g_hTimeZoneLocal;
 	CheckForUTC();
 }

test/test_468/model.bin

@@ -1 +1 @@
-a:1:{i:0;a:5:{i:0;a:2:{s:8:"sphinxql";s:38:"set global timezone='Asia/Novosibirsk'";s:14:"total_affected";i:0;}i:1;a:2:{s:8:"sphinxql";s:31:"create table rt1(tid timestamp)";s:14:"total_affected";i:0;}i:2;a:2:{s:8:"sphinxql";s:56:"INSERT into rt1 (id, tid) values (3, '2022-01-01T00:00')";s:14:"total_affected";i:1;}i:3;a:3:{s:8:"sphinxql";s:54:"SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:2:"id";s:1:"3";s:34:"date_format(tid, '%Y-%m-%dT%H:%M')";s:16:"2022-01-01T00:00";}}}i:4;a:2:{s:8:"sphinxql";s:14:"drop table rt1";s:14:"total_affected";i:0;}}}
+a:1:{i:0;a:14:{i:0;a:2:{s:8:"sphinxql";s:38:"set global timezone='Asia/Novosibirsk'";s:14:"total_affected";i:0;}i:1;a:3:{s:8:"sphinxql";s:32:"show variables like '%timezone%'";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:13:"Variable_name";s:8:"timezone";s:5:"Value";s:16:"Asia/Novosibirsk";}}}i:2;a:2:{s:8:"sphinxql";s:31:"create table rt1(tid timestamp)";s:14:"total_affected";i:0;}i:3;a:2:{s:8:"sphinxql";s:56:"INSERT into rt1 (id, tid) values (3, '2022-01-01T00:00')";s:14:"total_affected";i:1;}i:4;a:3:{s:8:"sphinxql";s:54:"SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:2:"id";s:1:"3";s:34:"date_format(tid, '%Y-%m-%dT%H:%M')";s:16:"2022-01-01T00:00";}}}i:5;a:2:{s:8:"sphinxql";s:25:"set global timezone='UTC'";s:14:"total_affected";i:0;}i:6;a:3:{s:8:"sphinxql";s:54:"SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:2:"id";s:1:"3";s:34:"date_format(tid, '%Y-%m-%dT%H:%M')";s:16:"2021-12-31T17:00";}}}i:7;a:2:{s:8:"sphinxql";s:14:"drop table rt1";s:14:"total_affected";i:0;}i:8;a:2:{s:8:"sphinxql";s:25:"set global timezone='UTC'";s:14:"total_affected";i:0;}i:9;a:3:{s:8:"sphinxql";s:32:"show variables like '%timezone%'";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:13:"Variable_name";s:8:"timezone";s:5:"Value";s:3:"UTC";}}}i:10;a:2:{s:8:"sphinxql";s:31:"create table rt1(tid timestamp)";s:14:"total_affected";i:0;}i:11;a:2:{s:8:"sphinxql";s:56:"INSERT into rt1 (id, tid) values (3, '2022-01-01T00:00')";s:14:"total_affected";i:1;}i:12;a:3:{s:8:"sphinxql";s:54:"SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1";s:10:"total_rows";i:1;s:4:"rows";a:1:{i:0;a:2:{s:2:"id";s:1:"3";s:34:"date_format(tid, '%Y-%m-%dT%H:%M')";s:16:"2022-01-01T00:00";}}}i:13;a:2:{s:8:"sphinxql";s:14:"drop table rt1";s:14:"total_affected";i:0;}}}

test/test_468/test.xml

@@ -16,6 +16,16 @@ searchd
 
 <queries><sphinxql>
 set global timezone='Asia/Novosibirsk';
+show variables like '%timezone%';
+create table rt1(tid timestamp);
+INSERT into rt1 (id, tid) values (3, '2022-01-01T00:00');
+SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1;
+set global timezone='UTC';
+SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1;
+drop table rt1;
+
+set global timezone='UTC';
+show variables like '%timezone%';
 create table rt1(tid timestamp);
 INSERT into rt1 (id, tid) values (3, '2022-01-01T00:00');
 SELECT id, date_format(tid, '%Y-%m-%dT%H:%M') from rt1;