Post-merge fixes:

- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc

client/Makefile.am

@@ -79,8 +79,6 @@ DEFS =			-DUNDEF_THREADS_HACK \
 			-DDATADIR="\"$(localstatedir)\"" 
 EXTRA_DIST =		get_password.c CMakeLists.txt
 
-EXTRA_DIST =		get_password.c CMakeLists.txt
-
 link_sources:
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \

mysql-test/include/loaddata_autocom.inc

@@ -7,14 +7,16 @@ eval SET SESSION STORAGE_ENGINE = $engine_type;
 drop table if exists t1;
 --enable_warnings
 
-create table t1 (a text, b text);
+# NDB does not support the create option 'Binlog of table with BLOB attribute and no PK'
+# So use a dummy PK here.
+create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 commit;
 select count(*) from t1;
 truncate table t1;
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 rollback;
 select count(*) from t1;
 

mysql-test/r/loaddata_autocom_innodb.result

 SET SESSION STORAGE_ENGINE = InnoDB;
 drop table if exists t1;
-create table t1 (a text, b text);
+create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 Warnings:
 Warning	1261	Row 3 doesn't contain data for all columns
 commit;
@@ -11,7 +11,7 @@ count(*)
 4
 truncate table t1;
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 Warnings:
 Warning	1261	Row 3 doesn't contain data for all columns
 rollback;

mysql-test/r/loaddata_autocom_ndb.result

 SET SESSION STORAGE_ENGINE = ndbcluster;
 drop table if exists t1;
-create table t1 (a text, b text);
+create table t1 (id int unsigned not null auto_increment primary key, a text, b text);
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 Warnings:
 Warning	1261	Row 3 doesn't contain data for all columns
 commit;
@@ -11,7 +11,7 @@ count(*)
 4
 truncate table t1;
 start transaction;
-load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+load data infile '../std_data_ln/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''' (a, b);
 Warnings:
 Warning	1261	Row 3 doesn't contain data for all columns
 rollback;

server-tools/instance-manager/Makefile.am

@@ -18,8 +18,7 @@ INCLUDES= @ZLIB_INCLUDES@ -I$(top_srcdir)/include \
 	@openssl_includes@ -I$(top_builddir)/include
 
 DEFS= -DMYSQL_INSTANCE_MANAGER -DMYSQL_SERVER
-EXTRA_DIST = IMService.cpp IMService.h WindowsService.cpp WindowsService.h \
-	CMakeLists.txt
+
 # As all autoconf variables depend from ${prefix} and being resolved only when
 # make is run, we can not put these defines to a header file (e.g. to
 # default_options.h, generated from default_options.h.in)

sql/log.h

@@ -177,7 +177,7 @@ class MYSQL_LOG
   pthread_mutex_t LOCK_log;
   char *name;
   char log_file_name[FN_REFLEN];
-  char time_buff[20], db[NAME_LEN + 1];
+  char time_buff[20], db[NAME_BYTE_LEN + 1];
   bool write_error, inited;
   IO_CACHE log_file;
   enum_log_type log_type;

storage/innobase/Makefile.am

@@ -36,7 +36,6 @@ SUBDIRS =		os ut btr buf data dict dyn eval fil fsp fut \
 			ha ibuf lock log mach mem mtr page \
 			handler \
 			pars que read rem row srv sync thr trx usr
-EXTRA_DIST = CMakeLists.txt
 
 EXTRA_DIST = 	include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr0cur.ic \
 		include/btr0pcur.h include/btr0pcur.ic include/btr0sea.h include/btr0sea.ic \