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 | 5051100a1ad79060abc07fd63f4d376e05c116b5 (patch) | |
| tree | 0320f9cfba455c1d3cb00160205b3412461fffb3 /sql-common | |
| parent | 4d6bf3ce1510a3ae2d1f33af204f5e31dec77f7c (diff) | |
| parent | 38b6d49e826e1fde46c445d790eb7609b14c4220 (diff) | |
| download | mariadb-git-5051100a1ad79060abc07fd63f4d376e05c116b5.tar.gz | |
Merge from 5.0
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index 2ec1fc253a7..95078a50097 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -165,7 +165,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint add_hours= 0, start_loop; ulong not_zero_date, allow_space; my_bool is_internal_format; - const char *pos, *last_field_pos; + const char *pos, *UNINIT_VAR(last_field_pos); const char *end=str+length; const uchar *format_position; my_bool found_delimitier= 0, found_space= 0; @@ -174,7 +174,6 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, DBUG_PRINT("ENTER",("str: %.*s",length,str)); LINT_INIT(field_length); - LINT_INIT(last_field_pos); *was_cut= 0; |