diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-01 21:55:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-02 10:09:44 +0100 |
| commit | d4df7bc9b1fbdfb5c98134091a9ff998af60954f (patch) | |
| tree | dfd2f5128ccf94b6e86d2475aee23acf53fa868c /storage/innobase/dict/dict0mem.cc | |
| parent | 80d3eee072025f34984e474ea160651eac9e11e5 (diff) | |
| parent | 96cb428b350ba48ee17ad9968d08f5318e48258c (diff) | |
| download | mariadb-git-d4df7bc9b1fbdfb5c98134091a9ff998af60954f.tar.gz | |
Merge branch 'github/10.0' into 10.1
Diffstat (limited to 'storage/innobase/dict/dict0mem.cc')
| -rw-r--r-- | storage/innobase/dict/dict0mem.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc index 0e5e9f65b04..dd8155c09eb 100644 --- a/storage/innobase/dict/dict0mem.cc +++ b/storage/innobase/dict/dict0mem.cc @@ -2,7 +2,7 @@ Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2013, 2017, MariaDB Corporation. +Copyright (c) 2013, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -319,8 +319,8 @@ dict_mem_table_col_rename_low( ut_ad(from_len <= NAME_LEN); ut_ad(to_len <= NAME_LEN); - char from[NAME_LEN]; - strncpy(from, s, NAME_LEN); + char from[NAME_LEN + 1]; + strncpy(from, s, NAME_LEN + 1); if (from_len == to_len) { /* The easy case: simply replace the column name in @@ -532,7 +532,8 @@ dict_mem_fill_column_struct( column->len = (unsigned int) col_len; #ifndef UNIV_HOTBACKUP dtype_get_mblen(mtype, prtype, &mbminlen, &mbmaxlen); - dict_col_set_mbminmaxlen(column, mbminlen, mbmaxlen); + column->mbminlen = mbminlen; + column->mbmaxlen = mbmaxlen; #endif /* !UNIV_HOTBACKUP */ } |