From 52c01e88d48760c3329390eda96ff1afee7a68f5 Mon Sep 17 00:00:00 2001 From: "tsmith/tim@siva.hindu.god" <> Date: Wed, 13 Sep 2006 15:37:35 -0600 Subject: [PATCH] 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 | 2 -- mysql-test/include/loaddata_autocom.inc | 8 +++++--- mysql-test/r/loaddata_autocom_innodb.result | 6 +++--- mysql-test/r/loaddata_autocom_ndb.result | 6 +++--- server-tools/instance-manager/Makefile.am | 3 +-- sql/log.h | 2 +- storage/innobase/Makefile.am | 1 - 7 files changed, 13 insertions(+), 15 deletions(-) diff --git a/client/Makefile.am b/client/Makefile.am index d9d458fa31f..d3e96dd126f 100644 --- a/client/Makefile.am +++ b/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; \ 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; diff --git a/mysql-test/r/loaddata_autocom_innodb.result b/mysql-test/r/loaddata_autocom_innodb.result index 10da6b5dde7..11a07cdb783 100644 --- a/mysql-test/r/loaddata_autocom_innodb.result +++ b/mysql-test/r/loaddata_autocom_innodb.result @@ -1,8 +1,8 @@ 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; diff --git a/mysql-test/r/loaddata_autocom_ndb.result b/mysql-test/r/loaddata_autocom_ndb.result index 94e5f825fa2..f98e6a76981 100644 --- a/mysql-test/r/loaddata_autocom_ndb.result +++ b/mysql-test/r/loaddata_autocom_ndb.result @@ -1,8 +1,8 @@ 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; diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index cf296266843..4719828081a 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/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) diff --git a/sql/log.h b/sql/log.h index 8f75601f02b..2b33f70392a 100644 --- a/sql/log.h +++ b/sql/log.h @@ -177,7 +177,7 @@ public: 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; diff --git a/storage/innobase/Makefile.am b/storage/innobase/Makefile.am index f784f57d4ff..bdab35f1dc0 100644 --- a/storage/innobase/Makefile.am +++ b/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 \