← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Monty Taylor
  • Date: 2009-02-21 01:15:13 UTC
  • mto: (892.1.5 devel)
  • mto: This revision was merged to the branch mainline in revision 898.
  • Revision ID: mordred@inaugust.com-20090221011513-c3jq8dfaiboc64cl
More solaris warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
487
487
   m_lip(NULL),
488
488
   scheduler(0)
489
489
{
490
 
  ulong tmp;
 
490
  uint32_t tmp;
491
491
 
492
492
  /*
493
493
    Pass nominal parameters to init_alloc_root only to ensure that
554
554
  const Query_id& local_query_id= Query_id::get_query_id();
555
555
  tablespace_op= false;
556
556
  tmp= sql_rnd();
557
 
  drizzleclient_drizzleclient_randominit(&rand, tmp + (ulong) &rand, tmp + local_query_id.value());
 
557
  drizzleclient_drizzleclient_randominit(&rand, tmp + (uint32_t) &rand,
 
558
                                         tmp + (uint32_t)local_query_id.value());
558
559
  substitute_null_with_insert_id = false;
559
560
  thr_lock_info_init(&lock_info); /* safety: will be reset after start */
560
561
  thr_lock_owner_init(&main_lock_id, &lock_info);