Post-merge fixes:

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

1 files changed, 5 insertions, 3 deletions

diff --git a/mysql-test/include/loaddata_autocom.inc b/mysql-test/include/loaddata_autocom.inc
index e5071c73c49..cca56709331 100644
--- a/mysql-test/include/loaddata_autocom.inc
+++ b/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;