summaryrefslogtreecommitdiff
path: root/mysql-test/main/log_tables.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-22 08:26:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-22 08:26:28 +0300
commite3d692aa092a76415ce1ce0e9662338873d84abb (patch)
treec6c7fafc561b589f82ed3a0afd696822fd52962d /mysql-test/main/log_tables.result
parent88d22f0e65192ca1b1e69b46661ce57ce19dbaa4 (diff)
parent620ea816adeceaba7c875679ab8505f4c07a22b8 (diff)
downloadmariadb-git-e3d692aa092a76415ce1ce0e9662338873d84abb.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/log_tables.result')
-rw-r--r--mysql-test/main/log_tables.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/main/log_tables.result b/mysql-test/main/log_tables.result
index 6059afc6631..84e43a6be00 100644
--- a/mysql-test/main/log_tables.result
+++ b/mysql-test/main/log_tables.result
@@ -380,6 +380,14 @@ slow_log
slow_log_new
drop table slow_log_new, general_log_new;
use test;
+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;
SET GLOBAL LOG_OUTPUT = 'TABLE';
SET GLOBAL general_log = 0;
FLUSH LOGS;