diff options
| author | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-02-25 00:10:51 +0100 |
|---|---|---|
| committer | unknown <lars/lthalmann@mysql.com/dl145j.mysql.com> | 2007-02-25 00:10:51 +0100 |
| commit | 33dbda5eae195c8151293ecf6d3459e15ba8a7dd (patch) | |
| tree | 6815c42dd93f2316e6b17d51739fa05c6ed55e92 /sql/field.cc | |
| parent | 9a8f8497f0a71acaba055e49dec99bc0a91caff9 (diff) | |
| parent | 849b95ce6279d7ced68b34bf47ea4f658ca80bd9 (diff) | |
| download | mariadb-git-33dbda5eae195c8151293ecf6d3459e15ba8a7dd.tar.gz | |
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/field.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 981a877783f..e1720834400 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7014,7 +7014,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs) cannot_convert_error_pos, from + length)) return 2; - if (copy_length < length) + if (from_end_pos < from + length) { report_data_too_long(this); return 2; |