← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzle.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-06 22:31:11 UTC
  • mfrom: (2386 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2396.
  • Revision ID: olafvdspek@gmail.com-20110806223111-irz1ie6xoy4q0prc
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzle.cc
2751
2751
      drizzle_result_free(result);
2752
2752
    }
2753
2753
 
2754
 
    if (ret != DRIZZLE_RETURN_SERVER_GONE || retry > 1 ||
 
2754
    if (ret != DRIZZLE_RETURN_LOST_CONNECTION || retry > 1 ||
2755
2755
        !opt_reconnect)
2756
2756
    {
2757
2757
      return error;
4036
4036
          return error;
4037
4037
        }
4038
4038
 
4039
 
        if (ret != DRIZZLE_RETURN_SERVER_GONE || !try_again)
 
4039
        if (ret != DRIZZLE_RETURN_LOST_CONNECTION || !try_again)
4040
4040
          return put_error(&con, NULL);
4041
4041
 
4042
4042
        if (reconnect())
4763
4763
 
4764
4764
static const char * strcont(const char *str, const char *set)
4765
4765
{
4766
 
  const char * start = (const char *) set;
 
4766
  const char * start = set;
4767
4767
 
4768
4768
  while (*str)
4769
4769
  {
4770
4770
    while (*set)
4771
4771
    {
4772
4772
      if (*set++ == *str)
4773
 
        return ((const char*) str);
 
4773
        return str;
4774
4774
    }
4775
4775
    set=start; str++;
4776
4776
  }