diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-06-24 01:09:05 +0400 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-06-24 01:09:05 +0400 |
| commit | efc3321841380d3b2becffc38e38086b51db77be (patch) | |
| tree | 1e02afe7f87d6abfe9ba5d29018d5468a4318fbf /sql/tztime.cc | |
| parent | 253e0a213be0dfff1c201d62081ec05cbd1bfae8 (diff) | |
| parent | 8bfaf2531832bc71b73fc439b9622902fe5c687a (diff) | |
| download | mariadb-git-efc3321841380d3b2becffc38e38086b51db77be.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix
sql/tztime.cc:
Auto merged
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 7bdc6fe1ac4..a3ef866ad6a 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1725,7 +1725,7 @@ tz_load_from_db(THD *thd, const String *tz_name) goto end_with_unlock; } - tzid= table->field[1]->val_int(); + tzid= (uint)table->field[1]->val_int(); table->file->index_end(); @@ -1769,7 +1769,7 @@ tz_load_from_db(THD *thd, const String *tz_name) 4, HA_READ_KEY_EXACT); while (!res) { - ttid= table->field[1]->val_int(); + ttid= (uint)table->field[1]->val_int(); if (ttid > TZ_MAX_TYPES) { @@ -1779,7 +1779,7 @@ tz_load_from_db(THD *thd, const String *tz_name) goto end_with_unlock; } - ttis[ttid].tt_gmtoff= table->field[2]->val_int(); + ttis[ttid].tt_gmtoff= (long)table->field[2]->val_int(); ttis[ttid].tt_isdst= (table->field[3]->val_int() > 0); #ifdef ABBR_ARE_USED @@ -2115,7 +2115,8 @@ my_tz_find(THD *thd, const String * name) } } } else { - if ((tmp_tzname= (TZ_NAMES_ENTRY *)hash_search(&tz_names, name->ptr(), + if ((tmp_tzname= (TZ_NAMES_ENTRY *)hash_search(&tz_names, + (const byte *)name->ptr(), name->length()))) result_tz= tmp_tzname->tz; else |