Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 48 insertions, 0 deletions

diff --git a/mysql-test/suite/innodb_i_s/innodb_trx.result b/mysql-test/suite/innodb_i_s/innodb_trx.result
new file mode 100644
index 00000000..36a08d8a
--- /dev/null
+++ b/mysql-test/suite/innodb_i_s/innodb_trx.result
@@ -0,0 +1,48 @@
+SHOW CREATE TABLE INFORMATION_SCHEMA.INNODB_TRX;
+Table	Create Table
+INNODB_TRX	CREATE TEMPORARY TABLE `INNODB_TRX` (
+  `trx_id` bigint(21) unsigned NOT NULL,
+  `trx_state` varchar(13) NOT NULL,
+  `trx_started` datetime NOT NULL,
+  `trx_requested_lock_id` varchar(81),
+  `trx_wait_started` datetime,
+  `trx_weight` bigint(21) unsigned NOT NULL,
+  `trx_mysql_thread_id` bigint(21) unsigned NOT NULL,
+  `trx_query` varchar(1024),
+  `trx_operation_state` varchar(64),
+  `trx_tables_in_use` bigint(21) unsigned NOT NULL,
+  `trx_tables_locked` bigint(21) unsigned NOT NULL,
+  `trx_lock_structs` bigint(21) unsigned NOT NULL,
+  `trx_lock_memory_bytes` bigint(21) unsigned NOT NULL,
+  `trx_rows_locked` bigint(21) unsigned NOT NULL,
+  `trx_rows_modified` bigint(21) unsigned NOT NULL,
+  `trx_concurrency_tickets` bigint(21) unsigned NOT NULL,
+  `trx_isolation_level` enum('READ UNCOMMITTED','READ COMMITTED','REPEATABLE READ','SERIALIZABLE') NOT NULL,
+  `trx_unique_checks` int(1) NOT NULL,
+  `trx_foreign_key_checks` int(1) NOT NULL,
+  `trx_last_foreign_key_error` varchar(256),
+  `trx_is_read_only` int(1) NOT NULL,
+  `trx_autocommit_non_locking` int(1) NOT NULL
+) ENGINE=MEMORY DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci
+CREATE TEMPORARY TABLE t1 LIKE INFORMATION_SCHEMA.INNODB_TRX;
+DROP TEMPORARY TABLE t1;
+CREATE TEMPORARY TABLE t1 AS SELECT * FROM INFORMATION_SCHEMA.INNODB_TRX LIMIT 0;
+DROP TEMPORARY TABLE t1;
+#
+# Start of 10.5 tests
+#
+#
+# MDEV-26507 Assertion `tmp != ((long long) 0x8000000000000000LL)' failed in TIME_from_longlong_datetime_packed
+#
+CREATE ALGORITHM=TEMPTABLE VIEW i AS
+SELECT a.trx_started
+FROM INFORMATION_SCHEMA.innodb_lock_waits w
+JOIN INFORMATION_SCHEMA.innodb_trx a
+ORDER BY a.trx_wait_started;
+SET SESSION sql_mode='ALLOW_INVALID_DATES';
+SELECT * FROM i;
+SET SESSION sql_mode=DEFAULT;
+DROP VIEW i;
+#
+# End of 10.5 tests
+#