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.
MariaDB · Apr 6, 2015 · eb83e94 · eb83e94
1 parent 2f6d63f
commit eb83e94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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` (