← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_class.cc

Merged in fix-headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_class.cc
29
29
#include <mysys/mysys_err.h>
30
30
#include <drizzled/error.h>
31
31
#include <drizzled/innodb_plugin_extras.h>
 
32
#include <drizzled/query_id.h>
32
33
 
33
34
/*
34
35
  The following is used to initialise Table_ident with a internal
556
557
  protocol= &protocol_text;                     // Default protocol
557
558
  protocol_text.init(this);
558
559
 
 
560
  const Query_id& query_id= Query_id::get_query_id();
559
561
  tablespace_op= false;
560
562
  tmp= sql_rnd();
561
 
  randominit(&rand, tmp + (ulong) &rand, tmp + (ulong) ::global_query_id);
 
563
  randominit(&rand, tmp + (ulong) &rand, tmp + query_id.value());
562
564
  substitute_null_with_insert_id = false;
563
565
  thr_lock_info_init(&lock_info); /* safety: will be reset after start */
564
566
  thr_lock_owner_init(&main_lock_id, &lock_info);