diff options
| author | unknown <pekka@mysql.com> | 2005-01-27 18:12:04 +0100 |
|---|---|---|
| committer | unknown <pekka@mysql.com> | 2005-01-27 18:12:04 +0100 |
| commit | 965288542f5e30d8f475f97582f123235b275174 (patch) | |
| tree | 7fa47f30294590f204879c183eeccc4bcb2944d8 /sql | |
| parent | a271a6c878ffe8245bd631888bfeee3cb5055005 (diff) | |
| parent | 1ed40339e24296a51b4e22bbb434aa2752c19601 (diff) | |
| download | mariadb-git-965288542f5e30d8f475f97582f123235b275174.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_ndbcluster.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 437b5ebcdf7..a959cbaf434 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3360,14 +3360,14 @@ static int create_ndb_column(NDBCOL &col, col.setLength(1); break; // Date types - case MYSQL_TYPE_TIMESTAMP: - col.setType(NDBCOL::Unsigned); - col.setLength(1); - break; case MYSQL_TYPE_DATETIME: col.setType(NDBCOL::Datetime); col.setLength(1); break; + case MYSQL_TYPE_DATE: // ? + col.setType(NDBCOL::Char); + col.setLength(field->pack_length()); + break; case MYSQL_TYPE_NEWDATE: col.setType(NDBCOL::Date); col.setLength(1); @@ -3376,10 +3376,13 @@ static int create_ndb_column(NDBCOL &col, col.setType(NDBCOL::Time); col.setLength(1); break; - case MYSQL_TYPE_DATE: // ? - case MYSQL_TYPE_YEAR: - col.setType(NDBCOL::Char); - col.setLength(field->pack_length()); + case MYSQL_TYPE_YEAR: + col.setType(NDBCOL::Year); + col.setLength(1); + break; + case MYSQL_TYPE_TIMESTAMP: + col.setType(NDBCOL::Timestamp); + col.setLength(1); break; // Char types case MYSQL_TYPE_STRING: |