← 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: lbieber
  • Date: 2010-08-23 22:45:16 UTC
  • mfrom: (1727.2.1 staging)
  • Revision ID: lbieber@orisndriz03-20100823224516-k12j5r4znqnznr9d
Merge Vijay - bug 621866 - Changed --transaction-log.sync-method to --transaction-log.flush-frequency
Merge Lee - bug 622005 updateing test results that need to sorted by adding --sorted_result - 
Merge Andrew - bug #617537 re-connect connectionID is wrong 
Merge Andrew - bug #617534 incorrect error when reconnecting

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/drizzle_protocol/drizzle_protocol.cc
36
36
 
37
37
#define PROTOCOL_VERSION 10
38
38
 
39
 
namespace drizzled
40
 
{
41
 
extern uint32_t global_thread_id;
42
 
}
43
39
namespace po= boost::program_options;
44
40
using namespace drizzled;
45
41
using namespace std;
678
674
    *end= 0;
679
675
    end++;
680
676
 
681
 
    int4store((unsigned char*) end, global_thread_id);
 
677
    int4store((unsigned char*) end, session->variables.pseudo_thread_id);
682
678
    end+= 4;
683
679
 
684
680
    /* We don't use scramble anymore. */