diff options
author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-05-31 17:45:22 +0300 |
---|---|---|
committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2007-05-31 17:45:22 +0300 |
commit | c6ff8a6500f6e3e08d01fcf0687f6987e5adefa6 (patch) | |
tree | c5cb3acad2572a7c0914ef20f2d942ea40433ab7 /mysys/hash.c | |
parent | 64a82941b440b0ef4a73ebabda342d250e24c5ea (diff) | |
download | mariadb-git-c6ff8a6500f6e3e08d01fcf0687f6987e5adefa6.tar.gz |
Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
client/mysqltest.c:
Added casts to avoid compiler warnings.
---
Added casts to avoid compiler warnings.
mysql-test/lib/mtr_report.pl:
Test run now fails if we have [Warning] and [ERROR] as tags in .err file
Added list of all common 'not fatal' errors to ignore error list
---
Give warnings also for safe_mutex errors
Added some warnings from different machines in pushbuild
---
Added escapes for double quotes and parenthesis.
---
Added non-critical warnings to be ignored.
---
Fixed a wrong regexp
Added new non-critical warning
mysql-test/mysql-test-run-shell.sh:
Fixed some wrong startup options
mysql-test/r/func_misc.result:
Test case for archive db fix.
mysql-test/t/disabled.def:
Disable instance manager tests because they generate warnings (and probably don't read the option files correctly)
mysql-test/t/func_misc.test:
Test case for archive db fix.
mysys/array.c:
Added casts to avoid compiler warnings.
mysys/hash.c:
Added casts to avoid compiler warnings.
mysys/my_compress.c:
Added casts to remove compiler warnings on windows
mysys/my_conio.c:
To avoid a warning from compiler.
mysys/my_pread.c:
Archive db fix.
mysys/my_quick.c:
Added cast to avoid compiler warning.
---
Added cast to avoid compiler warning.
sql/ha_ndbcluster_binlog.cc:
Ensure we log all binglog errors with the "NDB Binlog" tag
sql/ha_partition.cc:
result is type bool, so calculation should be forced to
that also.
sql/log.cc:
Fixed compiler problem on Solaris.
sql/slave.cc:
Make errors uniform
sql/sql_class.cc:
Added cast to remove compiler warnings on windows
sql/sql_map.cc:
Added casts to avoid compiler warnings.
---
Added casts to avoid compiler warnings.
sql/sql_plugin.cc:
Fixed wrong type.
---
Don't give warning that readonly variable is forced to be readonly
sql/stacktrace.c:
Corrected manual reference
storage/archive/azio.c:
Archive db fix.
---
Fixed previously added patch.
storage/blackhole/ha_blackhole.cc:
Fixed wrong prototype that caused test to fail on 64 bit platforms
storage/example/ha_example.cc:
Fixed wrong prototype that caused test to fail on 64 bit platforms
strings/ctype-ucs2.c:
Fixed wrong type.
---
Fixed wrong type.
support-files/compiler_warnings.supp:
Added new disabled warnings for Win 64.
Diffstat (limited to 'mysys/hash.c')
-rw-r--r-- | mysys/hash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mysys/hash.c b/mysys/hash.c index 698c2299f4d..d8c914d13dd 100644 --- a/mysys/hash.c +++ b/mysys/hash.c @@ -308,7 +308,8 @@ static int hashcmp(const HASH *hash, HASH_LINK *pos, const uchar *key, my_bool my_hash_insert(HASH *info,const uchar *record) { int flag; - uint halfbuff,hash_nr,first_index,idx; + size_t idx; + uint halfbuff,hash_nr,first_index; uchar *ptr_to_rec,*ptr_to_rec2; HASH_LINK *data,*empty,*gpos,*gpos2,*pos; @@ -535,7 +536,8 @@ exit: my_bool hash_update(HASH *hash, uchar *record, uchar *old_key, size_t old_key_length) { - uint idx,new_index,new_pos_index,blength,records,empty; + uint new_index,new_pos_index,blength,records,empty; + size_t idx; HASH_LINK org_link,*data,*previous,*pos; DBUG_ENTER("hash_update"); @@ -546,7 +548,7 @@ my_bool hash_update(HASH *hash, uchar *record, uchar *old_key, if ((found= hash_first(hash, new_key, idx, &state))) do { - if (found != record) + if (found != (char*) record) DBUG_RETURN(1); /* Duplicate entry */ } while ((found= hash_next(hash, new_key, idx, &state))); |