lots of post-merge changes

1 files changed, 43 insertions, 0 deletions

diff --git a/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test b/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test
new file mode 100644
index 00000000000..7887e2d19b5
--- /dev/null
+++ b/mysql-test/suite/sys_vars/t/maria_sort_buffer_size_basic.test
@@ -0,0 +1,43 @@
+# ulong session
+--source include/have_maria.inc
+
+SET @start_global_value = @@global.maria_sort_buffer_size;
+
+#
+# exists as global only
+#
+select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
+select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
+show global variables like '%aria_sort_buffer_size';
+show session variables like '%aria_sort_buffer_size';
+select * from information_schema.global_variables where variable_name like '%aria_sort_buffer_size';
+select * from information_schema.session_variables where variable_name like '%aria_sort_buffer_size';
+
+#
+# show that it's writable
+#
+set global maria_sort_buffer_size=10;
+select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
+set session maria_sort_buffer_size=10;
+select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
+
+#
+# incorrect types
+#
+--error ER_WRONG_TYPE_FOR_VAR
+set global maria_sort_buffer_size=1.1;
+--error ER_WRONG_TYPE_FOR_VAR
+set session maria_sort_buffer_size=1e1;
+--error ER_WRONG_TYPE_FOR_VAR
+set global maria_sort_buffer_size="foo";
+
+#
+# min/max values, block size
+#
+set global maria_sort_buffer_size=0;
+select @@global.maria_sort_buffer_size, @@global.aria_sort_buffer_size;
+set session maria_sort_buffer_size=cast(-1 as unsigned int);
+select @@session.maria_sort_buffer_size, @@session.aria_sort_buffer_size;
+
+SET @@global.maria_sort_buffer_size = @start_global_value;
+