diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-09-17 17:25:52 +0200 |
| commit | d6ca0cbb23544e2e033f512f400a91ce6245a9a4 (patch) | |
| tree | 0320f9cfba455c1d3cb00160205b3412461fffb3 /sql/item_timefunc.cc | |
| parent | 2535ede7138cb4d1e8986d18b4154c377ba37f3f (diff) | |
| parent | e5888b16afcef42e8127a815cc5a95abc283c6d9 (diff) | |
| download | mariadb-git-d6ca0cbb23544e2e033f512f400a91ce6245a9a4.tar.gz | |
Merge from 5.0
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index a9e5c71ab56..cf38a294e55 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -278,9 +278,9 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, int strict_week_number_year= -1; int frac_part; bool usa_time= 0; - bool sunday_first_n_first_week_non_iso; - bool strict_week_number; - bool strict_week_number_year_type; + bool UNINIT_VAR(sunday_first_n_first_week_non_iso); + bool UNINIT_VAR(strict_week_number); + bool UNINIT_VAR(strict_week_number_year_type); const char *val_begin= val; const char *val_end= val + length; const char *ptr= format->format.str; @@ -288,11 +288,6 @@ static bool extract_date_time(DATE_TIME_FORMAT *format, CHARSET_INFO *cs= &my_charset_bin; DBUG_ENTER("extract_date_time"); - LINT_INIT(strict_week_number); - /* Remove valgrind varnings when using gcc 3.3 and -O1 */ - PURIFY_OR_LINT_INIT(strict_week_number_year_type); - PURIFY_OR_LINT_INIT(sunday_first_n_first_week_non_iso); - if (!sub_pattern_end) bzero((char*) l_time, sizeof(*l_time)); |