diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:05:13 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-11-20 17:05:13 +0100 |
| commit | 32ec8625afd2b72afd8f96fd773342c8da9f0be1 (patch) | |
| tree | 9d46be3fa61a7f4d5fb8e724c308d9d9fba896a9 /storage/xtradb/row/row0sel.cc | |
| parent | a9a6bd5256ba5f983eae633c591391f2bf4dfc80 (diff) | |
| parent | b1e84da1012081a5c83f0670a9f222816578581b (diff) | |
| download | mariadb-git-32ec8625afd2b72afd8f96fd773342c8da9f0be1.tar.gz | |
XtraDB 5.6.21-70.0
Diffstat (limited to 'storage/xtradb/row/row0sel.cc')
| -rw-r--r-- | storage/xtradb/row/row0sel.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/storage/xtradb/row/row0sel.cc b/storage/xtradb/row/row0sel.cc index 75adc341d2e..6c7796e3ee6 100644 --- a/storage/xtradb/row/row0sel.cc +++ b/storage/xtradb/row/row0sel.cc @@ -2454,13 +2454,12 @@ row_sel_convert_mysql_key_to_innobase( /* Storing may use at most data_len bytes of buf */ if (UNIV_LIKELY(!is_null)) { - ut_a(buf + data_len <= original_buf + buf_len); - row_mysql_store_col_in_innobase_format( - dfield, buf, - FALSE, /* MySQL key value format col */ - key_ptr + data_offset, data_len, - dict_table_is_comp(index->table)); - buf += data_len; + buf = row_mysql_store_col_in_innobase_format( + dfield, buf, + FALSE, /* MySQL key value format col */ + key_ptr + data_offset, data_len, + dict_table_is_comp(index->table)); + ut_a(buf <= original_buf + buf_len); } key_ptr += data_field_len; @@ -2504,9 +2503,6 @@ row_sel_convert_mysql_key_to_innobase( dfield++; } - DBUG_EXECUTE_IF("innodb_srch_key_buffer_full", - ut_a(buf == (original_buf + buf_len));); - ut_a(buf <= original_buf + buf_len); /* We set the length of tuple to n_fields: we assume that the memory |