diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 17:05:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-19 17:05:05 +0300 |
| commit | 79ed33c184e6e2a7d3796a16e29bbe7417610366 (patch) | |
| tree | 7e8c3e6d8405f3755769aceec078ee32c3bb72a8 /sql/item.h | |
| parent | 2e9f4cdc44cc560860b2b6c2a34a172df3dc9d49 (diff) | |
| parent | a8f044e1a42fedc7ad1c5532873af3d812c0b493 (diff) | |
| download | mariadb-git-79ed33c184e6e2a7d3796a16e29bbe7417610366.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index e4f0c5974bd..39451d2631a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -3571,7 +3571,6 @@ public: enum Type type() const { - DBUG_ASSERT(fixed || state == NO_VALUE); return item_type; } |