← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/functions/connection_id.cc

  • Committer: Monty Taylor
  • Date: 2008-10-20 08:48:34 UTC
  • mfrom: (520.1.22 drizzle)
  • Revision ID: monty@inaugust.com-20081020084834-xpb3w01vkcp55o02
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/functions/connection_id.cc
28
28
}
29
29
 
30
30
 
31
 
bool Item_func_connection_id::fix_fields(THD *thd, Item **ref)
 
31
bool Item_func_connection_id::fix_fields(Session *session, Item **ref)
32
32
{
33
 
  if (Item_int_func::fix_fields(thd, ref))
 
33
  if (Item_int_func::fix_fields(session, ref))
34
34
    return true;
35
 
  thd->thread_specific_used= true;
36
 
  value= thd->variables.pseudo_thread_id;
 
35
  session->thread_specific_used= true;
 
36
  value= session->variables.pseudo_thread_id;
37
37
  return false;
38
38
}
39
39