diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
| commit | f59ef9eafa076cd5d3ae3aedc609efa457492ebe (patch) | |
| tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /sql-common | |
| parent | a0e44ec1e8d2352df6dbf40c959e2115c9884c7e (diff) | |
| parent | 2217de25139f5994fc1c5c71f897ff0788813db0 (diff) | |
| download | mariadb-git-f59ef9eafa076cd5d3ae3aedc609efa457492ebe.tar.gz | |
Merge from 5.0 for 43414
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 | ||||
| -rw-r--r-- | sql-common/my_time.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 5a9ea84b498..05071865928 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1849,7 +1849,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, uint port, const char *unix_socket,ulong client_flag) { char buff[NAME_LEN+USERNAME_LENGTH+100]; - char *end,*host_info; + char *end,*host_info= NULL; my_socket sock; in_addr_t ip_addr; struct sockaddr_in sock_addr; @@ -1867,7 +1867,6 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user, #endif init_sigpipe_variables DBUG_ENTER("mysql_real_connect"); - LINT_INIT(host_info); DBUG_PRINT("enter",("host: %s db: %s user: %s", host ? host : "(Null)", diff --git a/sql-common/my_time.c b/sql-common/my_time.c index a1b85049934..18358519023 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -160,7 +160,7 @@ enum enum_mysql_timestamp_type str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, uint flags, int *was_cut) { - uint field_length, year_length, digits, i, number_of_fields; + uint field_length, UNINIT_VAR(year_length), digits, i, number_of_fields; uint date[MAX_DATE_PARTS], date_len[MAX_DATE_PARTS]; uint add_hours= 0, start_loop; ulong not_zero_date, allow_space; @@ -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(year_length); LINT_INIT(last_field_pos); *was_cut= 0; |