diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-18 18:30:01 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-02-18 18:30:01 +0200 |
| commit | 2c74799d6496f9dbc17bb2cbe764ac81e60e7734 (patch) | |
| tree | b2f9ce04949288f967f5599447635d76c4883a8b /storage/innobase/data/data0type.cc | |
| parent | f0b65102b23f006f596eef35e6e5f4f8b6d8146d (diff) | |
| download | mariadb-git-2c74799d6496f9dbc17bb2cbe764ac81e60e7734.tar.gz | |
MDEV-18627 Wrong result after instant size change of integer
If we instantly change the size of a fixed-length field
and treat it as kind-of variable-length, then we will need
conversions between old column values and new ones.
I tried adding such a conversion to row_build(), but then I
noticed that more conversions would be needed, because
old values still appeared in a freshly rebuilt secondary index,
causing a mismatch when trying to search with the correct
longer value that was converted in my provisional fix to row_build().
So, we will revert the essential part of
MDEV-15563: Instant ROW_FORMAT=REDUNDANT column extension
(commit 22feb179ae166500ec91feec6246c8154e33f9a2), but not
remove any tests.
Diffstat (limited to 'storage/innobase/data/data0type.cc')
| -rw-r--r-- | storage/innobase/data/data0type.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/storage/innobase/data/data0type.cc b/storage/innobase/data/data0type.cc index 53d019a4664..a154dc6b490 100644 --- a/storage/innobase/data/data0type.cc +++ b/storage/innobase/data/data0type.cc @@ -100,22 +100,6 @@ dtype_validate( return(TRUE); } -bool dict_col_t::same_charset(const dict_col_t& other) const -{ - if (dtype_is_non_binary_string_type(mtype, prtype) - && dtype_is_non_binary_string_type(other.mtype, other.prtype)) { - uint csn1 = (uint) dtype_get_charset_coll(prtype); - uint csn2 = (uint) dtype_get_charset_coll(other.prtype); - CHARSET_INFO* cs1 = get_charset(csn1, MYF(MY_WME)); - CHARSET_INFO* cs2 = get_charset(csn2, MYF(MY_WME)); - if (!my_charset_same(cs1, cs2)) { - return false; - } - } - - return true; -} - #ifdef UNIV_DEBUG /** Print a data type structure. @param[in] type data type */ |