← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/client.c

  • Committer: Monty Taylor
  • Date: 2008-09-14 22:10:23 UTC
  • mto: This revision was merged to the branch mainline in revision 388.
  • Revision ID: monty@inaugust.com-20080914221023-otz8vuui590zp5yf
Got rid of libsqlcommon and some surious defines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/client.c
1365
1365
  if ((length = cli_safe_read(drizzle)) == packet_error)
1366
1366
    return(1);
1367
1367
  free_old_query(drizzle);    /* Free old result */
1368
 
#ifdef DRIZZLE_CLIENT      /* Avoid warn of unused labels*/
1369
1368
get_info:
1370
 
#endif
1371
1369
  pos=(uchar*) drizzle->net.read_pos;
1372
1370
  if ((field_count= net_field_length(&pos)) == 0)
1373
1371
  {
1381
1379
      drizzle->info=(char*) pos;
1382
1380
    return(0);
1383
1381
  }
1384
 
#ifdef DRIZZLE_CLIENT
1385
1382
  if (field_count == NULL_LENGTH)    /* LOAD DATA LOCAL INFILE */
1386
1383
  {
1387
1384
    int error;
1397
1394
      return(1);
1398
1395
    goto get_info;        /* Get info packet */
1399
1396
  }
1400
 
#endif
1401
1397
  if (!(drizzle->server_status & SERVER_STATUS_AUTOCOMMIT))
1402
1398
    drizzle->server_status|= SERVER_STATUS_IN_TRANS;
1403
1399