lots of post-merge changes

1 files changed, 43 insertions, 0 deletions

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