← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_init.c

  • Committer: Patrick Galbraith
  • Date: 2008-07-24 16:57:40 UTC
  • mto: (202.2.4 rename-mysql-to-drizzle)
  • mto: This revision was merged to the branch mainline in revision 212.
  • Revision ID: patg@ishvara-20080724165740-x58yw6zs6d9o17lf
Most everything working with client rename
mysqlslap test still fails... can't connect to the server

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_init.c
15
15
 
16
16
#include "mysys_priv.h"
17
17
#include "my_static.h"
18
 
#include <mysys/mysys_err.h>
19
 
#include <mystrings/m_string.h>
20
 
#include <mystrings/m_ctype.h>
 
18
#include "mysys_err.h"
 
19
#include <m_string.h>
 
20
#include <m_ctype.h>
21
21
#include <signal.h>
22
22
 
23
23
bool my_init_done= 0;
24
24
uint    mysys_usage_id= 0;              /* Incremented for each my_init() */
25
 
uint32_t   my_thread_stack_size= 65536;
 
25
ulong   my_thread_stack_size= 65536;
26
26
 
27
 
static uint32_t atoi_octal(const char *str)
 
27
static ulong atoi_octal(const char *str)
28
28
{
29
29
  long int tmp;
30
 
  while (*str && my_isspace(&my_charset_utf8_general_ci, *str))
 
30
  while (*str && my_isspace(&my_charset_latin1, *str))
31
31
    str++;
32
32
  str2int(str,
33
33
          (*str == '0' ? 8 : 10),       /* Octalt or decimalt */
34
34
          0, INT_MAX, &tmp);
35
 
  return (uint32_t) tmp;
 
35
  return (ulong) tmp;
36
36
}
37
37
 
38
38
 
118
118
    struct rusage rus;
119
119
#ifdef HAVE_purify
120
120
    /* Purify assumes that rus is uninitialized after getrusage call */
121
 
    memset(&rus, 0, sizeof(rus));
 
121
    bzero((char*) &rus, sizeof(rus));
122
122
#endif
123
123
    if (!getrusage(RUSAGE_SELF, &rus))
124
124
      fprintf(info_file,"\n\