diff options
author | Sergei Petrunia <psergey@askmonty.org> | 2017-01-01 23:33:18 +0000 |
---|---|---|
committer | Sergei Petrunia <psergey@askmonty.org> | 2017-01-01 23:33:18 +0000 |
commit | d8288b306c500e7a87ca9f583de458510325c213 (patch) | |
tree | cf492cbb206e09d5ebe82024bdded038e44c6c93 /sql/field.cc | |
parent | ae0a490eb3447846f0c18e3485c5ae2d95c3a330 (diff) | |
parent | cfb59f3196aac1b41cdda79952031dcc64042914 (diff) | |
download | mariadb-git-d8288b306c500e7a87ca9f583de458510325c213.tar.gz |
Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocks
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index da20f00a41f..ef97ab857af 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8734,7 +8734,6 @@ double Field_enum::val_real(void) longlong Field_enum::val_int(void) { - ASSERT_COLUMN_MARKED_FOR_READ; return read_lowendian(ptr, packlength); } |