diff options
| author | Monty <monty@mariadb.org> | 2016-12-20 18:06:49 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-01-11 09:18:35 +0200 |
| commit | 1afb17047a61d7666d4c3d6e5fae97ec526693ba (patch) | |
| tree | 7efcf35581d2f0f0a306ce38d390f30c94384854 /sql/table.cc | |
| parent | ed008a74cf4cfe8619595ec71a6073a9e94f984c (diff) | |
| download | mariadb-git-1afb17047a61d7666d4c3d6e5fae97ec526693ba.tar.gz | |
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
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 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; |