← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to mysys/my_init.cc

  • Committer: Monty Taylor
  • Date: 2009-01-30 21:02:37 UTC
  • mto: (779.7.3 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090130210237-3n6ld8a9jc084jko
Commented out a test in subselect_sj - I think it might be a regression. Jay?

Show diffs side-by-side

added added

removed removed

Lines of Context:
mysys/my_init.cc
18
18
#include <mysys/mysys_err.h>
19
19
#include <mystrings/m_string.h>
20
20
#include <mystrings/m_ctype.h>
21
 
#include <signal.h>
 
21
#include <stdio.h>
 
22
#include <stdlib.h>
22
23
 
23
24
bool my_init_done= 0;
24
25
uint    mysys_usage_id= 0;              /* Incremented for each my_init() */
25
 
uint32_t   my_thread_stack_size= 65536;
26
26
 
27
27
static uint32_t atoi_octal(const char *str)
28
28
{
29
29
  long int tmp;
30
 
  while (*str && my_isspace(&my_charset_latin1, *str))
 
30
  while (*str && my_isspace(&my_charset_utf8_general_ci, *str))
31
31
    str++;
32
32
  str2int(str,
33
33
          (*str == '0' ? 8 : 10),       /* Octalt or decimalt */
104
104
    if (my_file_opened | my_stream_opened)
105
105
    {
106
106
      sprintf(errbuff[0],EE(EE_OPEN_WARNING),my_file_opened,my_stream_opened);
107
 
      (void) my_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL);
 
107
      /* TODO: Mark... look at replacement here
 
108
       * (void) my_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL);
 
109
       */
 
110
      (void) fflush(stdout);
 
111
      
108
112
      my_print_open_files();
109
113
    }
110
114
  }
111
115
  free_charsets();
112
116
  my_error_unregister_all();
113
 
  my_once_free();
114
117
 
115
118
  if ((infoflag & MY_GIVE_INFO) || print_info)
116
119
  {
150
153
    Check on destroying of mutexes. A few may be left that will get cleaned
151
154
    up by C++ destructors
152
155
  */
153
 
  safe_mutex_end((infoflag & (MY_GIVE_INFO | MY_CHECK_ERROR)) ? stderr :
154
 
                 (FILE *) 0);
 
156
  safe_mutex_end();
 
157
 
155
158
#endif /* defined(SAFE_MUTEX) */
156
159
 
157
160
  my_init_done=0;