Merge

configure.in:
  Auto merged
client/mysqlimport.c:
  Auto merged
include/config-win.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  SCCS merged

1 files changed, 3 insertions, 0 deletions

diff --git a/mysql-test/include/drop-on-restart.inc b/mysql-test/include/drop-on-restart.inc
index 841b636483a..af1d0d893e0 100644
--- a/mysql-test/include/drop-on-restart.inc
+++ b/mysql-test/include/drop-on-restart.inc
@@ -23,6 +23,7 @@ drop database if exists db1_secret;
 drop database if exists db2;
 drop database if exists federated;
 drop database if exists mysqldump_test_db;
+drop database if exists mysqlslap;
 drop database if exists mysqltest1;
 drop database if exists mysqltest2;
 drop database if exists mysqltest3;
@@ -34,6 +35,7 @@ drop database if exists mysqltest_bob;
 drop database if exists mysqltest_db1;
 drop database if exists mysqltest_prometheus;
 drop database if exists mysqltest_sisyfos;
+drop database if exists ndbsynctest;
 drop database if exists ndbtest1;
 drop database if exists rewrite;
 drop database if exists test2;
@@ -429,6 +431,7 @@ drop table if exists new_t2;
 drop table if exists not_exist;
 drop table if exists r1;
 drop table if exists t0,t1,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t21,t70;
+drop table if exists t00,t03,t04;
 drop table if exists t0_template;
 drop table if exists t1Aa,t2Aa,v1Aa,v2Aa;
 drop table if exists t1_1,t1_2,t9_1,t9_2,t1aa,t2aa;