diff options
| author | unknown <mskold@mysql.com> | 2005-02-01 10:05:22 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2005-02-01 10:05:22 +0100 |
| commit | af97b55308ee07b82837fa3e91b8ddb7f5e32d0a (patch) | |
| tree | 3305456120aff67a778b05a18de2a8aff865176e /ndb/test | |
| parent | fcbfb2971c6b0b1ba86809b10ad6f5740aea0c64 (diff) | |
| parent | cdce11a32b3f7801e942bd14b29f233008e335b9 (diff) | |
| download | mariadb-git-af97b55308ee07b82837fa3e91b8ddb7f5e32d0a.tar.gz | |
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'ndb/test')
| -rw-r--r-- | ndb/test/include/NdbSchemaOp.hpp | 4 | ||||
| -rw-r--r-- | ndb/test/run-test/Makefile.am | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/ndb/test/include/NdbSchemaOp.hpp b/ndb/test/include/NdbSchemaOp.hpp index e2fb4015b88..77e704c0e5c 100644 --- a/ndb/test/include/NdbSchemaOp.hpp +++ b/ndb/test/include/NdbSchemaOp.hpp @@ -575,10 +575,6 @@ convertColumnTypeToAttrType(NdbDictionary::Column::Type _type) case NdbDictionary::Column::Binary: case NdbDictionary::Column::Varbinary: return String; - case NdbDictionary::Column::Datetime: - case NdbDictionary::Column::Date: - case NdbDictionary::Column::Time: - case NdbDictionary::Column::Undefined: default: return NoAttrTypeDef; } diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am index 83dcb3dbbcf..a0033d7e838 100644 --- a/ndb/test/run-test/Makefile.am +++ b/ndb/test/run-test/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/ndb/config/type_util.mk.am include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am test_PROGRAMS = atrt -test_DATA=daily-basic-tests.txt daily-devel-tests.txt +test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \ atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh |