← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/archive/archive_reader.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/archive/archive_reader.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include "drizzled/global.h"
 
21
#include "config.h"
22
22
 
23
23
#include "azio.h"
24
24
#include <string.h>
25
25
#include <assert.h>
26
26
#include <stdio.h>
27
27
#include <stdarg.h>
 
28
#include <fcntl.h>
28
29
#include <mystrings/m_ctype.h>
29
30
#include <mystrings/m_string.h>
30
31
#include <mysys/my_getopt.h>
232
233
 
233
234
  if (opt_extract_frm)
234
235
  {
235
 
    File frm_file;
 
236
    int frm_file;
236
237
    char *ptr;
237
238
    frm_file= my_open(argv[1], O_CREAT|O_RDWR, MYF(0));
238
239
    ptr= (char *)malloc(sizeof(char) * reader_handle.frm_length);