From e3868ee07273b1ea2c495d92891fd7d1ed1eea9e Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
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/sql_handler.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql/sql_handler.cc')

diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 673af54ffeb..05e333e37fc 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -375,7 +375,8 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, SQL_HANDLER *reopen)
 
   /* Always read all columns */
   table->read_set= &table->s->all_set;
-  table->vcol_set= &table->s->all_set;
+  if (table->vcol_set)
+    table->vcol_set= &table->s->all_set;
 
   /* Restore the state. */
   thd->set_open_tables(backup_open_tables);
-- 
cgit v1.2.1