From 8bfaf2531832bc71b73fc439b9622902fe5c687a Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 24 Jun 2004 01:08:07 +0400 Subject: Fixed compilation on windows. sql/tztime.cc: Fixed compilation on Windows. Added casts to avoid warnings. 2nd argument of hash_search should be of type const byte *. --- sql/tztime.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sql/tztime.cc b/sql/tztime.cc index 0b0ae2839df..dcaba5771f2 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1721,7 +1721,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(); @@ -1765,7 +1765,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) { @@ -1775,7 +1775,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 @@ -2111,7 +2111,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 -- cgit v1.2.1