← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/client.c

  • Committer: Brian Aker
  • Date: 2009-03-07 17:21:24 UTC
  • mfrom: (919.1.3 merge)
  • Revision ID: brian@tangent.org-20090307172124-s1bnv3chifan0v5s
Merge of patches for removal of LOAD DATA "LOCAL"

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/client.c
42
42
#include "net_serv.h"
43
43
#include "pack.h"
44
44
#include "errmsg.h"
45
 
#include "local_infile.h"
46
45
#include "drizzle_methods.h"
47
46
 
48
47
#include <stdarg.h>
504
503
    drizzle->options.compress= 1;      /* Remember for connect */
505
504
    drizzle->options.client_flag|= CLIENT_COMPRESS;
506
505
    break;
507
 
  case DRIZZLE_OPT_LOCAL_INFILE:      /* Allow LOAD DATA LOCAL ?*/
508
 
    if (!arg || (*(uint32_t*) arg) ? 1 : 0)
509
 
      drizzle->options.client_flag|= CLIENT_LOCAL_FILES;
510
 
    else
511
 
      drizzle->options.client_flag&= ~CLIENT_LOCAL_FILES;
512
 
    break;
513
506
  case DRIZZLE_READ_DEFAULT_FILE:
514
507
    if (drizzle->options.my_cnf_file != NULL)
515
508
      free(drizzle->options.my_cnf_file);