← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_init.cc

  • Committer: Brian Aker
  • Date: 2009-05-03 22:35:33 UTC
  • mfrom: (997.2.26 mordred)
  • Revision ID: brian@gaz-20090503223533-lv7lwqelv08dnv2j
Merge of Monty's code

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_init.cc
29
29
  long int tmp;
30
30
  while (*str && my_isspace(&my_charset_utf8_general_ci, *str))
31
31
    str++;
32
 
  str2int(str,
33
 
          (*str == '0' ? 8 : 10),       /* Octalt or decimalt */
34
 
          0, INT_MAX, &tmp);
 
32
  tmp= strtol(str, NULL, (*str == '0' ? 8 : 10));
35
33
  return (uint32_t) tmp;
36
34
}
37
35
 
97
95
  {                                     /* Test if some file is left open */
98
96
    if (my_file_opened | my_stream_opened)
99
97
    {
100
 
      sprintf(errbuff[0],EE(EE_OPEN_WARNING),my_file_opened,my_stream_opened);
101
98
      /* TODO: Mark... look at replacement here
 
99
       * sprintf(errbuff[0],EE(EE_OPEN_WARNING),my_file_opened,my_stream_opened);
102
100
       * (void) my_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL);
103
101
       */
104
102
      (void) fflush(stdout);