diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-08-18 16:51:52 +0300 |
commit | f84e28c119b495da77e197f7cd18af4048fc3126 (patch) | |
tree | 5957008a7725e23cc6331b1251ff5d3f6b725076 /sql/sql_view.cc | |
parent | ac2857a5fbf851d90171ac55f23385869ee6ba83 (diff) | |
parent | e4901d9523ab838ea13bb0278980f8707aa2c581 (diff) | |
download | mariadb-git-f84e28c119b495da77e197f7cd18af4048fc3126.tar.gz |
Merge 10.3 into 10.4
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 c81b5db0d26..9d4ba09f1b3 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -837,7 +837,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; |