From 1afb17047a61d7666d4c3d6e5fae97ec526693ba Mon Sep 17 00:00:00 2001
From: Monty <monty@mariadb.org>
Date: Tue, 20 Dec 2016 18:06:49 +0200
Subject: Fixed bugs found by mysql-test-run:

- privilege_table_io.test didn't properly reset roles_mapping
- Fixed memory allocation problem with CHECK CONSTRAINT, found when
  running --valgrind main.check_constraint
---
 sql/table.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql')

diff --git a/sql/table.cc b/sql/table.cc
index 6d11ac3d3eb..5c9d4805943 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -3110,7 +3110,8 @@ enum open_frm_error open_table_from_share(THD *thd, TABLE_SHARE *share,
                                                 share->default_expressions +1)*
                                                sizeof(Field*)),
                           &check_constraint_ptr,
-                          (uint) ((share->table_check_constraints + 1)*
+                          (uint) ((share->table_check_constraints +
+                                   share->field_check_constraints + 1)*
                                   sizeof(Virtual_column_info*)),
                           NullS))
       goto err;
-- 
cgit v1.2.1