diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
| commit | 3cc8539d84f569f4829874bf36f4b44b0ceb030c (patch) | |
| tree | cc4cf6561f81b4d6b33af1dc5da888e6baff59af /sql/gcalc_tools.cc | |
| parent | 956d93b581b704fa56b0b6469ae35a2e79850ef4 (diff) | |
| parent | 1ace1075dc6bb02fe19802334f9d47446a17a79a (diff) | |
| download | mariadb-git-3cc8539d84f569f4829874bf36f4b44b0ceb030c.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'sql/gcalc_tools.cc')
| -rw-r--r-- | sql/gcalc_tools.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc index 307f063fb43..25c80a7a796 100644 --- a/sql/gcalc_tools.cc +++ b/sql/gcalc_tools.cc @@ -132,7 +132,7 @@ int Gcalc_function::count_internal(const char *cur_func, uint set_type, int mask= (c_op & op_not) ? 1:0; uint n_ops= c_op & ~(op_any | op_not | v_mask); uint n_shape= c_op & ~(op_any | op_not | v_mask); /* same as n_ops */ - value v_state= (value) (c_op & v_mask); + op_type v_state= (op_type) (c_op & v_mask); int result= 0; const char *sav_cur_func= cur_func; |