mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Applying InnoDB snapshot

Browse source 
Detailed revision comments:

r6285 | marko | 2009-12-09 09:24:50 +0200 (Wed, 09 Dec 2009) | 13 lines
branches/zip: row_sel_fetch_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns,

Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it.  Then I decided that it would be
too risky.  The redundant check was part of the mapping.  The
condition may have been dfield_is_null() initially.

This redundant code was noticed by Sergey Petrunya on the MySQL
internals list.
r6288 | marko | 2009-12-09 09:51:00 +0200 (Wed, 09 Dec 2009) | 15 lines
branches/zip: row_upd_copy_columns(): Remove redundant code that was
accidentally added in r1591, which introduced dfield_t::ext in order
to make the merge sort of fast index creation support externally
stored columns.

Initially, I tried to allocate the bit for dfield_t::ext from
dfield_t::len by making the length 31 bits and mapping UNIV_SQL_NULL
to something that would fit in it.  Then I decided that it would be
too risky.  The redundant check was part of the mapping.  The
condition may have been dfield_is_null() initially.

This is similar to the redundant code in row_sel_fetch_columns() that
was noticed by Sergey Petrunya on the MySQL internals list and removed
in r6285.  As far as I can tell, there are no redundant UNIV_SQL_NULL
assignments remaining after this change.
This commit is contained in:
Sergey Vojtovich 2010-04-01 15:03:27 +04:00
parent 058a71f2ba
commit 2a187a5153
2 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/innodb_plugin/row/row0sel.c
View file

@ -431,10 +431,6 @@ row_sel_fetch_columns(
data = rec_get_nth_field(rec, offsets, data = rec_get_nth_field(rec, offsets,
field_no, &len); field_no, &len);
if (len == UNIV_SQL_NULL) {
len = UNIV_SQL_NULL;
}
needs_copy = column->copy_val; needs_copy = column->copy_val;
} }

3
storage/innodb_plugin/row/row0upd.c
View file

@ -1344,9 +1344,6 @@ row_upd_copy_columns(
data = rec_get_nth_field(rec, offsets, data = rec_get_nth_field(rec, offsets,
column->field_nos[SYM_CLUST_FIELD_NO], column->field_nos[SYM_CLUST_FIELD_NO],
&len); &len);
if (len == UNIV_SQL_NULL) {
len = UNIV_SQL_NULL;
}
eval_node_copy_and_alloc_val(column, data, len); eval_node_copy_and_alloc_val(column, data, len);
column = UT_LIST_GET_NEXT(col_var_list, column); column = UT_LIST_GET_NEXT(col_var_list, column);