mirror of
https://github.com/MariaDB/server.git
synced 2026-04-24 17:25:31 +02:00
Merge with MySQL 5.1.50
- Changed to still use bcmp() in certain cases becasue - Faster for short unaligneed strings than memcmp() - Bettern when using valgrind - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems - Changed code to use MariaDB version of select->skip_record() - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
This commit is contained in:
commit
ad6d95d3cb
246 changed files with 3488 additions and 1500 deletions
|
|
@ -441,7 +441,7 @@ copy_extra_record_fields(TABLE *table,
|
|||
|
||||
DBUG_ASSERT(master_reclength <= table->s->reclength);
|
||||
if (master_reclength < table->s->reclength)
|
||||
bmove_align(table->record[0] + master_reclength,
|
||||
memcpy(table->record[0] + master_reclength,
|
||||
table->record[1] + master_reclength,
|
||||
table->s->reclength - master_reclength);
|
||||
|
||||
|
|
@ -720,7 +720,7 @@ static int find_and_fetch_row(TABLE *table, uchar *key)
|
|||
rnd_pos() returns the record in table->record[0], so we have to
|
||||
move it to table->record[1].
|
||||
*/
|
||||
bmove_align(table->record[1], table->record[0], table->s->reclength);
|
||||
memcpy(table->record[1], table->record[0], table->s->reclength);
|
||||
DBUG_RETURN(error);
|
||||
}
|
||||
|
||||
|
|
@ -1213,7 +1213,7 @@ int Update_rows_log_event_old::do_exec_row(TABLE *table)
|
|||
overwriting the default values that where put there by the
|
||||
unpack_row() function.
|
||||
*/
|
||||
bmove_align(table->record[0], m_after_image, table->s->reclength);
|
||||
memcpy(table->record[0], m_after_image, table->s->reclength);
|
||||
copy_extra_record_fields(table, m_master_reclength, m_width);
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue