From e3868ee07273b1ea2c495d92891fd7d1ed1eea9e Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 6 Nov 2015 13:02:19 +0200 Subject: Don't store vcol bitmaps in TABLE if table doesn't have virtual fields. (Makes TABLE a bit smaller) --- sql/table.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sql/table.h') diff --git a/sql/table.h b/sql/table.h index 6ecfdefc088..ab3960300e6 100644 --- a/sql/table.h +++ b/sql/table.h @@ -1065,12 +1065,15 @@ public: ORDER *group; String alias; /* alias or table name */ uchar *null_flags; - MY_BITMAP def_read_set, def_write_set, def_vcol_set, tmp_set; + MY_BITMAP def_read_set, def_write_set, tmp_set; MY_BITMAP def_rpl_write_set; MY_BITMAP eq_join_set; /* used to mark equi-joined fields */ MY_BITMAP cond_set; /* used to mark fields from sargable conditions*/ /* Active column sets */ - MY_BITMAP *read_set, *write_set, *vcol_set, *rpl_write_set; + MY_BITMAP *read_set, *write_set, *rpl_write_set; + /* Set if using virtual fields */ + MY_BITMAP *vcol_set, *def_vcol_set; + /* The ID of the query that opened and is using this table. Has different meanings depending on the table type. @@ -1322,7 +1325,7 @@ public: { read_set= &def_read_set; write_set= &def_write_set; - vcol_set= &def_vcol_set; + vcol_set= def_vcol_set; /* Note that this may be 0 */ rpl_write_set= 0; } /** Should this instance of the table be reopened? */ -- cgit v1.2.1