← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/parameters_ms.cc

  • Committer: Lee Bieber
  • Date: 2010-11-07 22:53:13 UTC
  • mfrom: (1909.4.6 pbms-tests)
  • mto: This revision was merged to the branch mainline in revision 1912.
  • Revision ID: kalebral@gmail.com-20101107225313-26nhv0btydq2sh74
Merge Stewart - Fix bug 616466: auto_increment and PBMS problem - adds test case for this, can no longer reproduce the problem

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/pbms/src/parameters_ms.cc
64
64
#endif
65
65
 
66
66
 
67
 
static int my_port_number = PBMS_PORT;
 
67
uint32_t pbms_port_number = PBMS_PORT;
68
68
 
69
69
static char             *my_repository_threshold = NULL;
70
70
static char             *my_temp_log_threshold = NULL;
123
123
#endif
124
124
 
125
125
//--------------
126
 
uint32_t PBMSParameters::getPortNumber(){ return my_port_number;}
 
126
uint32_t PBMSParameters::getPortNumber(){ return pbms_port_number;}
127
127
 
128
128
//--------------
129
129
uint32_t PBMSParameters::getServerID(){ return my_server_id;}
487
487
 
488
488
//-----------------
489
489
//-----------------
490
 
static MYSQL_SYSVAR_INT(port, my_port_number,
491
 
        PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
 
490
static MYSQL_SYSVAR_UINT(port, pbms_port_number,
 
491
        PLUGIN_VAR_READONLY,
492
492
        "The port for the server stream-based communications.",
493
493
        NULL, NULL, PBMS_PORT, 0, 64*1024, 1);
494
494