diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-06-19 14:03:41 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-06-19 14:03:41 +0400 |
| commit | c450f7d8d5bfdc0d3ae0fbc634eb22d4b75e7322 (patch) | |
| tree | 30e1e8d1c2d0fe276cd391d6122b3990ce87b579 /sql/table.cc | |
| parent | 3661d9882224dd485556ce937c1294eaeda02ef8 (diff) | |
| parent | 15b92915ed93661a56f40430204d18bf7b7cf1fc (diff) | |
| download | mariadb-git-c450f7d8d5bfdc0d3ae0fbc634eb22d4b75e7322.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
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 6a5cd7dba59..85dffeb9167 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1499,7 +1499,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. |