diff --git a/.bzrignore b/.bzrignore index 82859703566..87ef6963549 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1748,3 +1748,10 @@ vio/viotest-sslconnect.cpp vio/viotest.cpp zlib/*.ds? zlib/*.vcproj +mysql-test/r/backup.log +mysql-test/r/events.log +mysql-test/r/events_bugs.log +mysql-test/r/events_logs_tests.log +mysql-test/r/mysqltest.log +mysql-test/r/symlink.log +mysql-test/r/system_mysql_db.log diff --git a/mysql-test/r/system_mysql_db.result b/mysql-test/r/system_mysql_db.result index 21c698fc814..30cde39531d 100644 --- a/mysql-test/r/system_mysql_db.result +++ b/mysql-test/r/system_mysql_db.result @@ -193,7 +193,7 @@ show create table event; Table Create Table event CREATE TABLE `event` ( `db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', - `name` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', + `name` char(64) NOT NULL DEFAULT '', `body` longblob NOT NULL, `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '', `execute_at` datetime DEFAULT NULL,