diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
| commit | 9b98cae4cc44fa39813675b361b7aa65d129b29d (patch) | |
| tree | 7f4baeea245f91006e88c62508c2859ed9390c2d /storage/xtradb | |
| parent | 29af1aefe914da6aca73498c077f7e37a36d7de4 (diff) | |
| parent | 4d128777dde904c5f0adab9b093e854c9c580d41 (diff) | |
| download | mariadb-git-9b98cae4cc44fa39813675b361b7aa65d129b29d.tar.gz | |
merge with 5.1-micro
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 5 | ||||
| -rw-r--r-- | storage/xtradb/handler/i_s.cc | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index c37bfe6a2c4..c4e6fa0df0d 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -4492,10 +4492,7 @@ get_innobase_type_from_mysql_type( case MYSQL_TYPE_LONG_BLOB: return(DATA_BLOB); case MYSQL_TYPE_NULL: - /* MySQL currently accepts "NULL" datatype, but will - reject such datatype in the next release. We will cope - with it and not trigger assertion failure in 5.1 */ - break; + return(DATA_FIXBINARY); default: ut_error; } diff --git a/storage/xtradb/handler/i_s.cc b/storage/xtradb/handler/i_s.cc index f6160614686..d989ce87aa3 100644 --- a/storage/xtradb/handler/i_s.cc +++ b/storage/xtradb/handler/i_s.cc @@ -168,7 +168,7 @@ field_store_time_t( my_time.time_type = MYSQL_TIMESTAMP_DATETIME; #endif - return(field->store_time(&my_time, MYSQL_TIMESTAMP_DATETIME)); + return(field->store_time(&my_time)); } /*******************************************************************//** |