← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzle/client.c

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzle/client.c
299
299
 
300
300
  if (len == packet_error || len == 0)
301
301
  {
302
 
#ifdef MYSQL_SERVER
 
302
#ifdef DRIZZLE_SERVER
303
303
    if (net->vio && vio_was_interrupted(net->vio))
304
304
      return (packet_error);
305
305
#endif /*DRIZZLE_SERVER*/
1112
1112
  cli_use_result,                              /* use_result */
1113
1113
  cli_fetch_lengths,                           /* fetch_lengths */
1114
1114
  cli_flush_use_result,                         /* flush_use_result */
1115
 
#ifndef MYSQL_SERVER
 
1115
#ifndef DRIZZLE_SERVER
1116
1116
  cli_list_fields,                            /* list_fields */
1117
1117
  cli_unbuffered_fetch,                        /* unbuffered_fetch */
1118
1118
  cli_read_statistics,                         /* read_statistics */
1131
1131
  /* Set character set */
1132
1132
  if (!drizzle->options.charset_name)
1133
1133
  {
1134
 
    default_collation_name= MYSQL_DEFAULT_COLLATION_NAME;
 
1134
    default_collation_name= DRIZZLE_DEFAULT_COLLATION_NAME;
1135
1135
    if (!(drizzle->options.charset_name=
1136
 
       my_strdup(MYSQL_DEFAULT_CHARSET_NAME,MYF(MY_WME))))
 
1136
       my_strdup(DRIZZLE_DEFAULT_CHARSET_NAME,MYF(MY_WME))))
1137
1137
    return 1;
1138
1138
  }
1139
1139
  else
1707
1707
  if ((length = cli_safe_read(drizzle)) == packet_error)
1708
1708
    return(1);
1709
1709
  free_old_query(drizzle);    /* Free old result */
1710
 
#ifdef MYSQL_CLIENT      /* Avoid warn of unused labels*/
 
1710
#ifdef DRIZZLE_CLIENT      /* Avoid warn of unused labels*/
1711
1711
get_info:
1712
1712
#endif
1713
1713
  pos=(uchar*) drizzle->net.read_pos;
1723
1723
      drizzle->info=(char*) pos;
1724
1724
    return(0);
1725
1725
  }
1726
 
#ifdef MYSQL_CLIENT
 
1726
#ifdef DRIZZLE_CLIENT
1727
1727
  if (field_count == NULL_LENGTH)    /* LOAD DATA LOCAL INFILE */
1728
1728
  {
1729
1729
    int error;