Merge 10.2 into 10.3

1 files changed, 19 insertions, 1 deletions

diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test
index 0823b3e0eb4..97a143a8fa5 100644
--- a/mysql-test/main/log_tables.test
+++ b/mysql-test/main/log_tables.test
@@ -54,7 +54,7 @@ select * from general_log where argument like '%general_log%';
 
 #
 # Check some basic queries interfering with the log tables.
-# In our test we'll use a tbale with verbose comments to the short
+# In our test we'll use a table with verbose comments to the short
 # command type names, used in the tables
 #
 
@@ -475,6 +475,24 @@ drop table slow_log_new, general_log_new;
 use test;
 
 #
+# Bug#69953 / MDEV-4851
+# Log tables should be modifable on LOG_OUTPUT != TABLE
+#
+#
+
+SET GLOBAL LOG_OUTPUT = 'FILE';
+SET GLOBAL slow_query_log = 1;
+SET GLOBAL general_log = 1;
+
+ALTER TABLE mysql.slow_log ADD COLUMN comment_text TEXT NOT NULL;
+ALTER TABLE mysql.general_log ADD COLUMN comment_text TEXT NOT NULL;
+
+SET GLOBAL LOG_OUTPUT = 'NONE';
+ALTER TABLE mysql.slow_log DROP COLUMN comment_text;
+ALTER TABLE mysql.general_log DROP COLUMN comment_text;
+
+
+#
 # Bug#27857 (Log tables supplies the wrong value for generating
 #            AUTO_INCREMENT numbers)
 #