← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/select_send.h

  • Committer: Monty Taylor
  • Date: 2009-04-09 05:35:58 UTC
  • mfrom: (984 merge)
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 986.
  • Revision ID: mordred@inaugust.com-20090409053558-qi1x0zzsgf1d8f1p
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/select_send.h
53
53
  bool send_fields(List<Item> &list, uint32_t flags)
54
54
  {
55
55
    bool res;
56
 
    if (!(res= session->protocol->send_fields(&list, flags)))
 
56
    if (!(res= session->protocol->sendFields(&list, flags)))
57
57
      is_result_set_started= 1;
58
58
    return res;
59
59
  }
97
97
    char buff[MAX_FIELD_WIDTH];
98
98
    String buffer(buff, sizeof(buff), &my_charset_bin);
99
99
 
100
 
    protocol->prepare_for_resend();
 
100
    protocol->prepareForResend();
101
101
    Item *item;
102
102
    while ((item=li++))
103
103
    {
110
110
    }
111
111
    session->sent_row_count++;
112
112
    if (session->is_error())
113
 
    {
114
 
      protocol->remove_last_row();
115
113
      return true;
116
 
    }
117
 
    if (protocol->io_ok())
 
114
    if (protocol->isConnected())
118
115
      return(protocol->write());
119
116
    return false;
120
117
  }