summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-12-13 23:12:14 +0100
committerSergei Golubchik <serg@mariadb.org>2018-12-20 08:06:55 +0100
commitfca44b7c1ffe5e32a94e8d4449bd1d9f91492c3a (patch)
tree1165c044bdbaaea39f976b9439de142ada887ed5 /sql/table.cc
parente765b47e41db54124c05732a903110eae08e1194 (diff)
downloadmariadb-git-fca44b7c1ffe5e32a94e8d4449bd1d9f91492c3a.tar.gz
MDEV-17909 Problem by MariaDB Update 10.1.32 -> 10.2.19 (Incorrect information in file: .frm)
use frm_version, not mysql_version when parsing frm In particular, virtual columns are stored according to frm_version. And CHECK TABLE will overwrite mysql_version to the current server version, so it cannot correctly describe frm format.
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index 0cf88aed4f6..dbf10bc8293 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1027,7 +1027,7 @@ bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table,
while (pos < end)
{
uint type, expr_length;
- if (table->s->mysql_version >= 100202)
+ if (table->s->frm_version >= FRM_VER_EXPRESSSIONS)
{
uint field_nr, name_length;
/* see pack_expression() for how data is stored */