~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to include/comp_err.c

  • Committer: Andrey Hristov
  • Date: 2008-07-30 22:51:24 UTC
  • mfrom: (239 drizzle)
  • mto: (236.1.16 codestyle)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: ahristov@mysql.com-20080730225124-h4j0soxqkyrvlc44
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
  multi-language text file.
23
23
*/
24
24
 
25
 
#include <my_global.h>
 
25
#include <drizzled/global.h>
26
26
#include <mystrings/m_ctype.h>
27
27
#include <mysys/my_sys.h>
28
28
#include <mystrings/m_string.h>
29
29
#include <mysys/my_getopt.h>
30
30
#include <assert.h>
31
 
#include <my_dir.h>
32
31
 
33
32
#define MAX_ROWS  1000
34
33
#define HEADER_LENGTH 32                /* Length of header in errmsg.sys */
316
315
    /* continue with header of the errmsg.sys file */
317
316
    length= ftell(to) - HEADER_LENGTH - row_count * 2;
318
317
    memset((uchar*) head, 0, HEADER_LENGTH);
319
 
    bmove((uchar *) head, (uchar *) file_head, 4);
 
318
    memcpy((uchar *) head, (uchar *) file_head, 4);
320
319
    head[4]= 1;
321
320
    int2store(head + 6, length);
322
321
    int2store(head + 8, row_count);