← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/discover.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/discover.cc
51
51
  size_t read_len;
52
52
  uchar *read_data;
53
53
  struct stat state;  
54
 
  DBUG_ENTER("readfrm");
55
 
  DBUG_PRINT("enter",("name: '%s'",name));
56
54
  
57
55
  *frmdata= NULL;      // In case of errors
58
56
  *len= 0;
85
83
    VOID(my_close(file,MYF(MY_WME)));
86
84
  
87
85
 err_end:                     /* Here when no file */
88
 
  DBUG_RETURN (error);
 
86
  return(error);
89
87
} /* readfrm */
90
88
 
91
89
 
108
106
  File file;
109
107
  char   index_file[FN_REFLEN];
110
108
  int error;
111
 
  DBUG_ENTER("writefrm");
112
 
  DBUG_PRINT("enter",("name: '%s' len: %lu ",name, (ulong) len));
113
109
 
114
110
  error= 0;
115
111
  if ((file=my_create(fn_format(index_file,name,"",reg_ext,
120
116
      error= 2;
121
117
    VOID(my_close(file,MYF(0)));
122
118
  }
123
 
  DBUG_RETURN(error);
 
119
  return(error);
124
120
} /* writefrm */
125
121
 
126
122