mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge of 5.1-bugteam
This commit is contained in:
@ -445,6 +445,9 @@ IF(
|
|||||||
count(*), 1)
|
count(*), 1)
|
||||||
1
|
1
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
select @v:=@v:=sum(1) from dual;
|
||||||
|
@v:=@v:=sum(1)
|
||||||
|
1
|
||||||
End of 5.1 tests
|
End of 5.1 tests
|
||||||
DROP TABLE IF EXISTS t1;
|
DROP TABLE IF EXISTS t1;
|
||||||
CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1));
|
CREATE TABLE t1(f1 INT AUTO_INCREMENT, PRIMARY KEY(f1));
|
||||||
|
@ -344,6 +344,13 @@ FROM t1 GROUP BY a LIMIT 1;
|
|||||||
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
#
|
||||||
|
# BUG#56138 "valgrind errors about overlapping memory when
|
||||||
|
# double-assigning same variable"
|
||||||
|
#
|
||||||
|
|
||||||
|
select @v:=@v:=sum(1) from dual;
|
||||||
|
|
||||||
--echo End of 5.1 tests
|
--echo End of 5.1 tests
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -787,11 +787,8 @@ int field_conv(Field *to,Field *from)
|
|||||||
((Field_varstring*)from)->length_bytes ==
|
((Field_varstring*)from)->length_bytes ==
|
||||||
((Field_varstring*)to)->length_bytes))
|
((Field_varstring*)to)->length_bytes))
|
||||||
{ // Identical fields
|
{ // Identical fields
|
||||||
#ifdef HAVE_purify
|
// to->ptr==from->ptr may happen if one does 'UPDATE ... SET x=x'
|
||||||
/* This may happen if one does 'UPDATE ... SET x=x' */
|
memmove(to->ptr, from->ptr, to->pack_length());
|
||||||
if (to->ptr != from->ptr)
|
|
||||||
#endif
|
|
||||||
memcpy(to->ptr,from->ptr,to->pack_length());
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4331,7 +4331,7 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length,
|
|||||||
length--; // Fix length change above
|
length--; // Fix length change above
|
||||||
entry->value[length]= 0; // Store end \0
|
entry->value[length]= 0; // Store end \0
|
||||||
}
|
}
|
||||||
memcpy(entry->value,ptr,length);
|
memmove(entry->value, ptr, length);
|
||||||
if (type == DECIMAL_RESULT)
|
if (type == DECIMAL_RESULT)
|
||||||
((my_decimal*)entry->value)->fix_buffer_pointer();
|
((my_decimal*)entry->value)->fix_buffer_pointer();
|
||||||
entry->length= length;
|
entry->length= length;
|
||||||
|
@ -4050,8 +4050,12 @@ update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_purify
|
#if defined(__GNUC__) && !MY_GNUC_PREREQ(4,4)
|
||||||
/* Valgrind complains about overlapped memcpy when save_pos==use. */
|
/*
|
||||||
|
Old gcc used a memcpy(), which is undefined if save_pos==use:
|
||||||
|
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19410
|
||||||
|
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39480
|
||||||
|
*/
|
||||||
if (save_pos != use)
|
if (save_pos != use)
|
||||||
#endif
|
#endif
|
||||||
*save_pos= *use;
|
*save_pos= *use;
|
||||||
|
Reference in New Issue
Block a user