#At file:///home/kgeorge/mysql/work/revert-45613-5.1-bugteam/ based on revid:alexey.kopytov@stripped
3217 Georgi Kodinov 2009-11-23
Additional fix for bug #45613: handle failures from my_hash_insert
Testing for presence of stuff in a hash inside the function
that's filling in the hash creates chicken-and-egg type of problems.
This results in test suite failures in mysql-pe in debug mode and
adds bad initialization dependency in 5.1.
Fixed by removing the debug code.
modified:
mysys/hash.c
=== modified file 'mysys/hash.c'
--- a/mysys/hash.c 2009-11-20 15:18:01 +0000
+++ b/mysys/hash.c 2009-11-23 15:32:10 +0000
@@ -334,7 +334,6 @@ my_bool my_hash_insert(HASH *info, const
size_t idx,halfbuff,hash_nr,first_index;
uchar *UNINIT_VAR(ptr_to_rec),*UNINIT_VAR(ptr_to_rec2);
HASH_LINK *data,*empty,*UNINIT_VAR(gpos),*UNINIT_VAR(gpos2),*pos;
- DBUG_EXECUTE("fail_hash_insert",return(TRUE););
if (HASH_UNIQUE & info->flags)
{
Attachment: [text/bzr-bundle] bzr/joro@sun.com-20091123153210-hzrgiaiwoyi56rmo.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-bugteam branch (joro:3217) Bug#45613 | Georgi Kodinov | 23 Nov |