diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-03-11 12:07:06 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2020-03-11 12:07:06 +0100 |
| commit | 19ef6bb73823bb213591deb7dff1b211fa59920e (patch) | |
| tree | f59cc56ffd57ca7aa3694e5160e752d7bde90706 /sql/discover.cc | |
| parent | e9765e6d594d98ae52acf0c1278857cc6c7061cc (diff) | |
| parent | 9d7ed94f6a526748eff29dae2939a3fd341f118b (diff) | |
| download | mariadb-git-bb-10.5-MDEV-13362.tar.gz | |
Merge branch '10.5' of https://github.com/MariaDB/server into bb-10.5-MDEV-13362bb-10.5-MDEV-13362
Diffstat (limited to 'sql/discover.cc')
| -rw-r--r-- | sql/discover.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/discover.cc b/sql/discover.cc index 3e41388ed51..e49a2a3b0c0 100644 --- a/sql/discover.cc +++ b/sql/discover.cc @@ -76,7 +76,8 @@ int readfrm(const char *name, const uchar **frmdata, size_t *len) // Read whole frm file error= 3; - if (!(read_data= (uchar*)my_malloc(read_len, MYF(MY_WME)))) + if (!(read_data= (uchar*)my_malloc(key_memory_frm_string, read_len, + MYF(MY_WME)))) goto err; if (mysql_file_read(file, read_data, read_len, MYF(MY_NABP))) { |