← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_strfunc.cc

Merged in fix-headers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_strfunc.cc
29
29
#include <drizzled/server_includes.h>
30
30
#include <mysys/sha1.h>
31
31
#include <zlib.h>
 
32
#include <drizzled/query_id.h>
32
33
 
33
34
#ifdef __cplusplus
34
35
extern "C" {
2549
2550
    ulong tmp= sql_rnd();
2550
2551
    unsigned char mac[6];
2551
2552
    int i;
 
2553
    const Query_id& query_id= Query_id::get_query_id();
2552
2554
    if (my_gethwaddr(mac))
2553
2555
    {
2554
2556
      /* purecov: begin inspected */
2558
2560
        with a clock_seq value (initialized random below), we use a separate
2559
2561
        randominit() here
2560
2562
      */
2561
 
      randominit(&uuid_rand, tmp + (ulong) session, tmp + (ulong)global_query_id);
 
2563
      randominit(&uuid_rand, tmp + (ulong) session, tmp + query_id.value());
2562
2564
      for (i=0; i < (int)sizeof(mac); i++)
2563
2565
        mac[i]=(unsigned char)(my_rnd(&uuid_rand)*255);
2564
2566
      /* purecov: end */