From eb83e9405f9f537ff49f6d325942133460aa510c Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Mon, 6 Apr 2015 19:13:33 +0300 Subject: [PATCH] MDEV-7917 main.log_tables fails sporadically in buildbot #2 mysql.slow_log table has an extra column in 10.1, so the test table copy should too -- added the column. --- mysql-test/r/log_tables.result | 3 ++- mysql-test/t/log_tables.test | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/log_tables.result b/mysql-test/r/log_tables.result index 1a4ee280f08..dd2beb87974 100644 --- a/mysql-test/r/log_tables.result +++ b/mysql-test/r/log_tables.result @@ -542,7 +542,8 @@ CREATE TABLE `db_17876.slow_log_data` ( `insert_id` int(11) default NULL, `server_id` int(11) default NULL, `sql_text` mediumtext, -`thread_id` bigint(21) unsigned default NULL +`thread_id` bigint(21) unsigned default NULL, +`rows_affected` int(11) default NULL ); CREATE TABLE `db_17876.general_log_data` ( `event_time` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/mysql-test/t/log_tables.test b/mysql-test/t/log_tables.test index 1a32ca8aaee..28f6e6dd829 100644 --- a/mysql-test/t/log_tables.test +++ b/mysql-test/t/log_tables.test @@ -727,7 +727,8 @@ CREATE TABLE `db_17876.slow_log_data` ( `insert_id` int(11) default NULL, `server_id` int(11) default NULL, `sql_text` mediumtext, - `thread_id` bigint(21) unsigned default NULL + `thread_id` bigint(21) unsigned default NULL, + `rows_affected` int(11) default NULL ); CREATE TABLE `db_17876.general_log_data` (