diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-19 14:04:53 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-19 14:04:53 +0400 |
| commit | f5b128dfad1f46bf73916bc9c803a7152fdd6809 (patch) | |
| tree | 447ef763592b99402ced91dd6e6203f2b3c5368f /sql/table.cc | |
| parent | f7b1b2bc5d6e1f923aca0ee8c5232cf095075c7b (diff) | |
| parent | c450f7d8d5bfdc0d3ae0fbc634eb22d4b75e7322 (diff) | |
| download | mariadb-git-f5b128dfad1f46bf73916bc9c803a7152fdd6809.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.1
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 4407d631db8..c3ddc75ede7 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1533,7 +1533,8 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write, if ((uchar)field_type == (uchar)MYSQL_TYPE_VIRTUAL) { - DBUG_ASSERT(interval_nr); // Expect non-null expression + if (!interval_nr) // Expect non-null expression + goto err; /* The interval_id byte in the .frm file stores the length of the expression statement for a virtual column. |