← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.h

Merged build changes from Antony.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.h
128
128
#define SPECIAL_LOG_QUERIES_NOT_USING_INDEXES 4096 /* Obsolete */
129
129
 
130
130
        /* Extern defines */
131
 
#define store_record(A,B) bmove_align((A)->B,(A)->record[0],(size_t) (A)->s->reclength)
132
 
#define restore_record(A,B) bmove_align((A)->record[0],(A)->B,(size_t) (A)->s->reclength)
 
131
#define store_record(A,B) memcpy((A)->B,(A)->record[0],(size_t) (A)->s->reclength)
 
132
#define restore_record(A,B) memcpy((A)->record[0],(A)->B,(size_t) (A)->s->reclength)
133
133
#define cmp_record(A,B) memcmp((A)->record[0],(A)->B,(size_t) (A)->s->reclength)
134
 
#define empty_record(A) { \
135
 
                          restore_record((A),s->default_values); \
136
 
                          bfill((A)->null_flags,(A)->s->null_bytes,255);\
137
 
                        }
 
134
#define empty_record(A)                                 \
 
135
  do {                                                  \
 
136
    restore_record((A),s->default_values);              \
 
137
    memset((A)->null_flags, 255, (A)->s->null_bytes);   \
 
138
  } while (0)
138
139
 
139
140
        /* Defines for use with openfrm, openprt and openfrd */
140
141
 
225
226
 
226
227
/* Include prototypes for unireg */
227
228
 
228
 
#include "mysqld_error.h"
 
229
#include <drizzled/error.h>
229
230
#include "structs.h"                            /* All structs we need */
230
231
 
231
232
#endif