summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Stepanova <elenst@montyprogram.com>2015-04-06 19:13:33 +0300
committerElena Stepanova <elenst@montyprogram.com>2015-04-06 19:13:33 +0300
commiteb83e9405f9f537ff49f6d325942133460aa510c (patch)
tree0f83fc49d5536a5f56bf923bad46a6cd58faa4c3
parent2f6d63f063d1c5dd0bec01b489df51f72213c2bc (diff)
downloadmariadb-git-eb83e9405f9f537ff49f6d325942133460aa510c.tar.gz
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.
-rw-r--r--mysql-test/r/log_tables.result3
-rw-r--r--mysql-test/t/log_tables.test3
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` (