From a02cac47f6a4ffce03e1e24ec7a00aa949819cce Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Fri, 7 Dec 2018 17:20:31 +0100 Subject: [PATCH 1/2] Fix an occational test failure in rpl.rpl_gtid_crash --- mysql-test/suite/rpl/t/rpl_gtid_crash.test | 1 + 1 file changed, 1 insertion(+) diff --git a/mysql-test/suite/rpl/t/rpl_gtid_crash.test b/mysql-test/suite/rpl/t/rpl_gtid_crash.test index 5cf28b6e49a..8255500a590 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_crash.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_crash.test @@ -186,6 +186,7 @@ EOF wait EOF START SLAVE; +--error 0,2006,2013 SET GLOBAL debug_dbug="+d,crash_commit_after"; --connection server_1 From 2fd0acd30ffd5f9091b272ca1ff2a883ca36718b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 7 Dec 2018 23:58:42 +0200 Subject: [PATCH 2/2] Fix the 64-bit Windows build --- sql/sql_acl.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 837f6650f17..59ba324df31 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -9621,7 +9621,7 @@ static int handle_grant_struct(enum enum_acl_lists struct_no, bool drop, elements= acl_users.elements; break; case DB_ACL: - elements= acl_dbs.elements(); + elements= int(acl_dbs.elements()); break; case COLUMN_PRIVILEGES_HASH: grant_name_hash= &column_priv_hash; @@ -11274,7 +11274,7 @@ static int show_database_grants(THD *thd, SHOW_VAR *var, char *buff, { var->type= SHOW_UINT; var->value= buff; - *(uint *)buff= acl_dbs.elements(); + *(uint *)buff= uint(acl_dbs.elements()); return 0; }