diff options
| author | heikki@donna.mysql.fi <> | 2001-03-07 19:43:46 +0200 |
|---|---|---|
| committer | heikki@donna.mysql.fi <> | 2001-03-07 19:43:46 +0200 |
| commit | aba6b59b28c1a3e3023356db02eba810dafeb215 (patch) | |
| tree | a44bf1798418eb40c26765d9a5af379b45a5ff84 /sql/ha_innobase.cc | |
| parent | a5711053cc78615a156e5c51075f7ff97569bd73 (diff) | |
| download | mariadb-git-aba6b59b28c1a3e3023356db02eba810dafeb215.tar.gz | |
ha_innobase.cc Fix a bug in removal of trailing spaces of binary varchar strings, fix a bug in REPLACE
Diffstat (limited to 'sql/ha_innobase.cc')
| -rw-r--r-- | sql/ha_innobase.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc index 06b154252de..143e207a71c 100644 --- a/sql/ha_innobase.cc +++ b/sql/ha_innobase.cc @@ -1274,7 +1274,8 @@ innobase_convert_and_store_changed_col( if (len == UNIV_SQL_NULL) { data = NULL; - } else if (col_type == DATA_VARCHAR) { + } else if (col_type == DATA_VARCHAR || col_type == DATA_BINARY + || col_type == DATA_VARMYSQL) { /* Remove trailing spaces */ while (len > 0 && data[len - 1] == ' ') { len--; @@ -1340,12 +1341,12 @@ calc_row_difference( for (i = 0; i < n_fields; i++) { field = table->field[i]; - if (thd->query_id != field->query_id) { + /* if (thd->query_id != field->query_id) { */ /* TODO: check that these fields cannot have changed! */ - goto skip_field; - } + /* goto skip_field; + }*/ o_ptr = (byte*) old_row + get_field_offset(table, field); n_ptr = (byte*) new_row + get_field_offset(table, field); @@ -1398,7 +1399,6 @@ calc_row_difference( (prebuilt->table->cols + i)->clust_pos; n_changed++; } -skip_field: ; } |