diff options
| author | unknown <malff@lambda.weblab> | 2007-10-29 08:07:27 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.weblab> | 2007-10-29 08:07:27 -0600 |
| commit | f139033063f0af6b5df61c729b5a2a6406f28a64 (patch) | |
| tree | 8cb30784f49f514d565af5f0167c78d63cd9d4b3 /sql/protocol.cc | |
| parent | 08edbe4ea13fe8d547a646901b36d497e67f9531 (diff) | |
| parent | 7d9c59b7be412210413fc93602ec4522eb1f368b (diff) | |
| download | mariadb-git-f139033063f0af6b5df61c729b5a2a6406f28a64.tar.gz | |
Merge lambda.weblab:/home/malff/TREE/mysql-5.1-base
into lambda.weblab:/home/malff/TREE/mysql-5.1-rt-merge
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/select.result:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto 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 31d23ec94dd..51d408de9de 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++; |