diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-27 17:12:44 +0300 |
| commit | ad6d95d3cb420557cfc7efa658181a8d20b4c154 (patch) | |
| tree | 984bb45ca187a6cc38c7132a9600d91515df564e /sql/unireg.h | |
| parent | 9bc9855c16f815e71223398ef17cd6052becc44e (diff) | |
| parent | 7909541953de43c7b7d16513c8d612cfe405af67 (diff) | |
| download | mariadb-git-ad6d95d3cb420557cfc7efa658181a8d20b4c154.tar.gz | |
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
Diffstat (limited to 'sql/unireg.h')
| -rw-r--r-- | sql/unireg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/unireg.h b/sql/unireg.h index 4fbde3b8631..88a5ca5c12f 100644 --- a/sql/unireg.h +++ b/sql/unireg.h @@ -129,8 +129,8 @@ #define SPECIAL_LOG_QUERIES_NOT_USING_INDEXES 4096 /* Obsolete */ /* Extern defines */ -#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->s->reclength) -#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->s->reclength) +#define store_record(A,B) memcpy((A)->B,(A)->record[0],(size_t) (A)->s->reclength) +#define restore_record(A,B) memcpy((A)->record[0],(A)->B,(size_t) (A)->s->reclength) #define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->s->reclength) #define empty_record(A) { \ restore_record((A),s->default_values); \ |