diff options
| author | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
|---|---|---|
| committer | unknown <evgen@sunlight.local> | 2007-09-24 17:23:40 +0400 |
| commit | e4cbbcf8a970b854bfbc34f77571afdb0b247814 (patch) | |
| tree | dff8e299e24252baed98de65a5a6435bbbfcf1c4 /sql/protocol.cc | |
| parent | c2c760bdb60eaa22165b518c209381010d489604 (diff) | |
| parent | 17df0d648ca86d7074805228ba50d0f137b486d4 (diff) | |
| download | mariadb-git-e4cbbcf8a970b854bfbc34f77571afdb0b247814.tar.gz | |
Merge sunlight.local:/local_work/27216-bug-5.0-opt-mysql
into sunlight.local:/local_work/merge-5.1-opt-mysql
libmysql/libmysql.c:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/insert_select.result:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/type_datetime.result:
Manually merged
mysql-test/t/type_datetime.test:
Manually merged
sql/item_cmpfunc.cc:
Manually merged
sql/item_cmpfunc.h:
Manually merged
sql/sql_insert.cc:
Manually merged
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 2ed241c4c98..839109ef964 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -827,6 +827,7 @@ bool Protocol_text::store(const char *from, size_t length, field_types[field_pos] == MYSQL_TYPE_DECIMAL || field_types[field_pos] == MYSQL_TYPE_BIT || field_types[field_pos] == MYSQL_TYPE_NEWDECIMAL || + field_types[field_pos] == MYSQL_TYPE_NEWDATE || (field_types[field_pos] >= MYSQL_TYPE_ENUM && field_types[field_pos] <= MYSQL_TYPE_GEOMETRY)); field_pos++; |