diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-17 18:03:47 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-17 18:03:47 +0400 |
| commit | 9cde33f9ef139f7511db66393694bbc3af6a863f (patch) | |
| tree | a79ac30889991cd960f64550cd8d5d61625e52c8 | |
| parent | b525abefb2a86f5f9691b4f969108ec676f05306 (diff) | |
| download | mariadb-git-9cde33f9ef139f7511db66393694bbc3af6a863f.tar.gz | |
small fixes to make compiler happy.
| -rw-r--r-- | sql/gcalc_slicescan.cc | 2 | ||||
| -rw-r--r-- | sql/gcalc_tools.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc index 56732101e5f..a294a792490 100644 --- a/sql/gcalc_slicescan.cc +++ b/sql/gcalc_slicescan.cc @@ -151,7 +151,7 @@ static void GCALC_DBUG_PRINT_SLICE(const char *header, else lnbuf+= gcalc_pi_str(buf+lnbuf, slice->next_pi, "\t"); buf[lnbuf]= 0; - GCALC_DBUG_PRINT((buf)); + GCALC_DBUG_PRINT(("%s", buf)); } } diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc index f6203ba552f..b4b01767f5f 100644 --- a/sql/gcalc_tools.cc +++ b/sql/gcalc_tools.cc @@ -133,7 +133,7 @@ int Gcalc_function::count_internal(const char *cur_func, uint set_type, 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); - int result; + int result= 0; const char *sav_cur_func= cur_func; // GCALC_DBUG_ENTER("Gcalc_function::count_internal"); |