diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 18:22:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 18:22:35 +0300 |
| commit | 4a2595727465648f2d4e794d1b2f182345f0bee8 (patch) | |
| tree | 8d4734e6c5b2795455416191ca50d5a0fbd23cd9 /sql/sql_view.cc | |
| parent | da171182b7d79d21177d113d2bbaecbca21d8bbc (diff) | |
| parent | f84e28c119b495da77e197f7cd18af4048fc3126 (diff) | |
| download | mariadb-git-4a2595727465648f2d4e794d1b2f182345f0bee8.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index b7f64389f02..a95e52a72a0 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -845,7 +845,7 @@ int mariadb_fix_view(THD *thd, TABLE_LIST *view, bool wrong_checksum, if ((view->md5.str= (char *)thd->alloc(32 + 1)) == NULL) DBUG_RETURN(HA_ADMIN_FAILED); } - view->calc_md5(view->md5.str); + view->calc_md5(const_cast<char*>(view->md5.str)); view->md5.length= 32; } view->mariadb_version= MYSQL_VERSION_ID; |