From a175314c3e5827eb193872241446f2f8f5c9d33c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 20:07:14 +0200 Subject: Adding upstream version 1:10.5.12. Signed-off-by: Daniel Baumann --- mysql-test/suite/versioning/r/select2,trx_id.rdiff | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 mysql-test/suite/versioning/r/select2,trx_id.rdiff (limited to 'mysql-test/suite/versioning/r/select2,trx_id.rdiff') diff --git a/mysql-test/suite/versioning/r/select2,trx_id.rdiff b/mysql-test/suite/versioning/r/select2,trx_id.rdiff new file mode 100644 index 00000000..bdc20d1d --- /dev/null +++ b/mysql-test/suite/versioning/r/select2,trx_id.rdiff @@ -0,0 +1,38 @@ +--- select2.result 2018-06-29 17:51:17.142172085 +0200 ++++ select2,trx_id.reject 2018-06-29 18:03:49.034273090 +0200 +@@ -26,6 +26,8 @@ + select sys_start from t1 where x = 3 and y = 33 into @t1; + Warnings: + Warning 1287 ' INTO FROM...' instead ++set @x1= @t1; ++select trt_commit_ts(@x1) into @t1; + select x, y from t1; + x y + 0 100 +@@ -86,7 +88,7 @@ + 8 108 + 9 109 + 3 33 +-select x as ASOF2_x, y from t1 for system_time as of @t0; ++select x as ASOF2_x, y from t1 for system_time as of transaction @x0; + ASOF2_x y + 0 100 + 1 101 +@@ -98,7 +100,7 @@ + 7 107 + 8 108 + 9 109 +-select x as FROMTO2_x, y from t1 for system_time from '1970-01-01 00:00' to @t1; ++select x as FROMTO2_x, y from t1 for system_time from transaction @x0 to transaction @x1; + FROMTO2_x y + 0 100 + 1 101 +@@ -110,7 +112,7 @@ + 7 107 + 8 108 + 9 109 +-select x as BETWAND2_x, y from t1 for system_time between '1970-01-01 00:00' and timestamp @t1; ++select x as BETWAND2_x, y from t1 for system_time between transaction @x0 and transaction @x1; + BETWAND2_x y + 0 100 + 1 101 -- cgit v1.2.3