← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/drizzle_protocol/drizzle_protocol.cc

  • Committer: Andrew Hutchings
  • Date: 2010-09-08 19:03:09 UTC
  • mfrom: (1750 staging)
  • mto: (1750.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1751.
  • Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
37
37
 
38
38
#define PROTOCOL_VERSION 10
39
39
 
40
 
namespace drizzled
41
 
{
42
 
extern uint32_t global_thread_id;
43
 
}
44
40
namespace po= boost::program_options;
45
41
using namespace drizzled;
46
42
using namespace std;
690
686
    *end= 0;
691
687
    end++;
692
688
 
693
 
    int4store((unsigned char*) end, global_thread_id);
 
689
    int4store((unsigned char*) end, session->variables.pseudo_thread_id);
694
690
    end+= 4;
695
691
 
696
692
    /* We don't use scramble anymore. */