diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-04-01 12:04:26 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-04-01 12:04:26 +0300 |
| commit | 1aafea91e5e11c355b978c85544059224ec473cf (patch) | |
| tree | a6fe26c7dc5503bdb62ef60d3e7d5f4ca2b816bb /strings/ctype-utf8.c | |
| parent | fee40e27738122d5c7d7916a1cfa8cd2b5a20186 (diff) | |
| parent | cebec393cf0a5558a2800fb193ba098bda4eabe1 (diff) | |
| download | mariadb-git-1aafea91e5e11c355b978c85544059224ec473cf.tar.gz | |
Merge with 5.1
Fixed valgrind warnings found from running main.connect under valgrind
sql/sp_head.cc:
Ensure that vcol_info is reset
sql/sql_acl.cc:
Fixed usage of wrong memroot for password
sql/sql_yacc.yy:
Ensure that vcol_info is reset
Diffstat (limited to 'strings/ctype-utf8.c')
| -rw-r--r-- | strings/ctype-utf8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 7ddb852fa79..81329031b0b 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2308,7 +2308,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs, my_bool t_is_prefix) { int s_res,t_res; - my_wc_t UNINIT_VAR(s_wc), t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se=s+slen; const uchar *te=t+tlen; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; @@ -2378,7 +2378,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, my_bool diff_if_only_endspace_difference) { int s_res, t_res, res; - my_wc_t UNINIT_VAR(s_wc),t_wc; + my_wc_t UNINIT_VAR(s_wc), UNINIT_VAR(t_wc); const uchar *se= s+slen, *te= t+tlen; MY_UNICASE_INFO *const *uni_plane= cs->caseinfo; |