← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/protocol.cc

  • Committer: Brian Aker
  • Date: 2009-02-21 00:18:15 UTC
  • Revision ID: brian@tangent.org-20090221001815-x20e8h71e984lvs1
Completion (?) of uint conversion.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/protocol.cc
101
101
                        (const char*) from, length, from_cs, &dummy_errors);
102
102
 
103
103
  drizzleclient_net_store_length((unsigned char*) length_pos, to - length_pos - 1);
104
 
  packet->length((uint) (to - packet->ptr()));
 
104
  packet->length((uint32_t) (to - packet->ptr()));
105
105
  return 0;
106
106
}
107
107
 
179
179
  pos+=2;
180
180
 
181
181
  /* We can only return up to 65535 warnings in two bytes */
182
 
  uint32_t tmp= cmin(total_warn_count, (uint)65535);
 
182
  uint32_t tmp= cmin(total_warn_count, (uint32_t)65535);
183
183
  int2store(pos, tmp);
184
184
  pos+= 2;
185
185
 
241
241
    Don't send warn count during SP execution, as the warn_list
242
242
    is cleared between substatements, and mysqltest gets confused
243
243
  */
244
 
  uint32_t tmp= cmin(total_warn_count, (uint)65535);
 
244
  uint32_t tmp= cmin(total_warn_count, (uint32_t)65535);
245
245
  buff[0]= DRIZZLE_PROTOCOL_NO_MORE_DATA;
246
246
  int2store(buff+1, tmp);
247
247
  /*
421
421
unsigned char *net_store_data(unsigned char *to,int32_t from)
422
422
{
423
423
  char buff[20];
424
 
  uint32_t length=(uint) (int10_to_str(from,buff,10)-buff);
 
424
  uint32_t length=(uint32_t) (int10_to_str(from,buff,10)-buff);
425
425
  to=drizzleclient_net_store_length_fast(to,length);
426
426
  memcpy(to,buff,length);
427
427
  return to+length;
430
430
unsigned char *net_store_data(unsigned char *to,int64_t from)
431
431
{
432
432
  char buff[22];
433
 
  uint32_t length=(uint) (int64_t10_to_str(from,buff,10)-buff);
 
433
  uint32_t length=(uint32_t) (int64_t10_to_str(from,buff,10)-buff);
434
434
  to=drizzleclient_net_store_length_fast(to,length);
435
435
  memcpy(to,buff,length);
436
436
  return to+length;
500
500
 
501
501
 
502
502
    if (prot.store(STRING_WITH_LEN("def"), cs, session_charset) ||
503
 
        prot.store(field.db_name, (uint) strlen(field.db_name),
504
 
                   cs, session_charset) ||
505
 
        prot.store(field.table_name, (uint) strlen(field.table_name),
506
 
                   cs, session_charset) ||
507
 
        prot.store(field.org_table_name, (uint) strlen(field.org_table_name),
508
 
                   cs, session_charset) ||
509
 
        prot.store(field.col_name, (uint) strlen(field.col_name),
510
 
                   cs, session_charset) ||
511
 
        prot.store(field.org_col_name, (uint) strlen(field.org_col_name),
 
503
        prot.store(field.db_name, (uint32_t) strlen(field.db_name),
 
504
                   cs, session_charset) ||
 
505
        prot.store(field.table_name, (uint32_t) strlen(field.table_name),
 
506
                   cs, session_charset) ||
 
507
        prot.store(field.org_table_name, (uint32_t) strlen(field.org_table_name),
 
508
                   cs, session_charset) ||
 
509
        prot.store(field.col_name, (uint32_t) strlen(field.col_name),
 
510
                   cs, session_charset) ||
 
511
        prot.store(field.org_col_name, (uint32_t) strlen(field.org_col_name),
512
512
                   cs, session_charset) ||
513
513
        local_packet->realloc(local_packet->length()+12))
514
514
      goto err;
547
547
    pos[11]= 0;                         // For the future
548
548
    pos+= 12;
549
549
 
550
 
    local_packet->length((uint) (pos - local_packet->ptr()));
 
550
    local_packet->length((uint32_t) (pos - local_packet->ptr()));
551
551
    if (flags & SEND_DEFAULTS)
552
552
      item->send(&prot, &tmp);                  // Send default value
553
553
    if (prot.write())