← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Brian Aker
  • Date: 2008-08-11 05:35:22 UTC
  • Revision ID: brian@tangent.org-20080811053522-ja8if8vjk87wen23
Minor cleanups around ulong in kernel.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
233
233
static int check_connection(THD *thd)
234
234
{
235
235
  NET *net= &thd->net;
236
 
  ulong pkt_len= 0;
 
236
  uint32_t pkt_len= 0;
237
237
  char *end;
238
238
 
239
239
#ifdef SIGNAL_WITH_VIO_CLOSE
254
254
  }
255
255
  vio_keepalive(net->vio, true);
256
256
  
257
 
  ulong server_capabilites;
 
257
  uint32_t server_capabilites;
258
258
  {
259
259
    /* buff[] needs to big enough to hold the server_version variable */
260
260
    char buff[SERVER_VERSION_LENGTH + SCRAMBLE_LENGTH + 64];
309
309
  thd->client_capabilities= uint2korr(net->read_pos);
310
310
 
311
311
 
312
 
  thd->client_capabilities|= ((ulong) uint2korr(net->read_pos+2)) << 16;
 
312
  thd->client_capabilities|= ((uint32_t) uint2korr(net->read_pos+2)) << 16;
313
313
  thd->max_client_packet_length= uint4korr(net->read_pos+4);
314
314
  thd_init_client_charset(thd, (uint) net->read_pos[8]);
315
315
  thd->update_charset();
565
565
pthread_handler_t handle_one_connection(void *arg)
566
566
{
567
567
  THD *thd= (THD*) arg;
568
 
  ulong launch_time= (ulong) ((thd->thr_create_utime= my_micro_time()) -
 
568
  uint32_t launch_time= (uint32_t) ((thd->thr_create_utime= my_micro_time()) -
569
569
                              thd->connect_utime);
570
570
 
571
571
  if (thread_scheduler.init_new_connection_thread())