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

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

1 files changed, 51 insertions, 0 deletions

diff --git a/mysql-test/main/my_print_defaults.result b/mysql-test/main/my_print_defaults.result
new file mode 100644
index 00000000..64aa7b45
--- /dev/null
+++ b/mysql-test/main/my_print_defaults.result
@@ -0,0 +1,51 @@
+# MDEV-24248: my_print_defaults is not taking all the values when using
+# -e option which is called from mysql.server (extra_args).
+#
+# checking for mysql.server
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+--table_definition_cache=2000
+--read_buffer_size=1M
+--thread_cache_size=8
+--max_connections=1024
+--long_query_time=60
+--slow_query_log=1
+#
+# MDEV-25908: -e does not work for my_print_defaults
+#
+# Testing -e
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+#Testing --defaults-extra-file
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+#
+# Testing other options
+#
+# Testing -c option
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+# Testing --defaults-file
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+# Testing -g option
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+--table_definition_cache=2000
+--read_buffer_size=1M
+--thread_cache_size=8
+# Testing --defaults-group-suffix
+--key_buffer_size=20M
+--max_allowed_packet=250M
+--table_open_cache=1000
+--table_definition_cache=2000
+--read_buffer_size=1M
+--thread_cache_size=8
+# Testing --no-defaults
+# End of 10.5 Test