Misc test fixes

Author: MarkLeith

mysql-test/suite/sysschema/r/t_sys_config.result

@@ -8,6 +8,7 @@ SELECT variable, value, set_by FROM sys.sys_config;
 variable	value	set_by
 diagnostics.allow_i_s_tables	OFF	NULL
 diagnostics.include_raw	OFF	NULL
+ps_thread_trx_info.max_length	65535	NULL
 statement_performance_analyzer.limit	100	NULL
 statement_performance_analyzer.view	NULL	NULL
 statement_truncate_len	64	NULL
@@ -16,6 +17,7 @@ SELECT variable, value, set_by FROM sys.sys_config;
 variable	value	set_by
 diagnostics.allow_i_s_tables	OFF	NULL
 diagnostics.include_raw	OFF	NULL
+ps_thread_trx_info.max_length	65535	NULL
 statement_performance_analyzer.limit	100	NULL
 statement_performance_analyzer.view	NULL	NULL
 statement_truncate_len	128	NULL
@@ -25,6 +27,7 @@ variable	value	set_by
 diagnostics.allow_i_s_tables	OFF	NULL
 diagnostics.include_raw	OFF	NULL
 foo	bar	NULL
+ps_thread_trx_info.max_length	65535	NULL
 statement_performance_analyzer.limit	100	NULL
 statement_performance_analyzer.view	NULL	NULL
 statement_truncate_len	128	NULL
@@ -35,5 +38,6 @@ INSERT IGNORE INTO sys.sys_config (variable, value) VALUES
 ('statement_performance_analyzer.limit', 100),
 ('statement_performance_analyzer.view', NULL),
 ('diagnostics.allow_i_s_tables', 'OFF'),
-('diagnostics.include_raw', 'OFF');
+('diagnostics.include_raw', 'OFF'),
+('ps_thread_trx_info.max_length', 65535);
 SET @sys.ignore_sys_config_triggers := NULL;

mysql-test/suite/sysschema/t/fn_ps_thread_trx_info.test

@@ -1,7 +1,12 @@
--- source include/not_embedded.inc
 # Tests for sys schema
 # Verify the sys.ps_thread_trx_info() function perfoms as expected
 
+-- source include/not_embedded.inc
+# Performance schema tracks prepared statements separately, and does not
+# yet have a summary view that we can use for this view.
+# Until then, we disable this test with --ps-protocol
+-- source include/no_protocol.inc
+
 # Passing unknown connection id should return NULL
 SELECT sys.ps_thread_trx_info(234623462376);