diff options
| author | heikki@hundin.mysql.fi <> | 2003-06-15 01:04:28 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-06-15 01:04:28 +0300 |
| commit | 4da7f485b75867dbc2ed02054459d1e8050144f3 (patch) | |
| tree | 20d5e35fb0abb5c95cf3a833e58bcd4bf0a1c585 /innobase/include/row0mysql.ic | |
| parent | 8a52c2d20bdb23ef154aa5c6a5980a2d763c9c4e (diff) | |
| download | mariadb-git-4da7f485b75867dbc2ed02054459d1e8050144f3.tar.gz | |
Many files:
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
Diffstat (limited to 'innobase/include/row0mysql.ic')
| -rw-r--r-- | innobase/include/row0mysql.ic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/include/row0mysql.ic b/innobase/include/row0mysql.ic index e9d493da8b5..4ecd66e06ec 100644 --- a/innobase/include/row0mysql.ic +++ b/innobase/include/row0mysql.ic @@ -58,7 +58,8 @@ row_mysql_store_col_in_innobase_format( /*===================================*/ dfield_t* dfield, /* in/out: dfield */ byte* buf, /* in/out: buffer for the converted - value */ + value; this must be at least col_len + long! */ byte* mysql_data, /* in: MySQL column value, not SQL NULL; NOTE that dfield may also get a pointer to mysql_data, @@ -96,7 +97,6 @@ row_mysql_store_col_in_innobase_format( while (col_len > 0 && ptr[col_len - 1] == ' ') { col_len--; } - } else if (type == DATA_BLOB) { ptr = row_mysql_read_blob_ref(&col_len, mysql_data, col_len); } |