← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/oldlibdrizzle/oldlibdrizzle.cc

Moved connect_timeout, net_*_timeout, and retry_count to plugin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/oldlibdrizzle/oldlibdrizzle.cc
18
18
 */
19
19
 
20
20
#include <drizzled/server_includes.h>
 
21
#include <drizzled/gettext.h>
21
22
#include <drizzled/error.h>
22
23
#include <drizzled/sql_state.h>
23
24
#include <drizzled/session.h>
36
37
 
37
38
static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
38
39
static uint32_t _port= 0;
 
40
static uint32_t connect_timeout;
 
41
static uint32_t read_timeout;
 
42
static uint32_t write_timeout;
 
43
static uint32_t retry_count;
39
44
 
40
45
ListenOldLibdrizzle::ListenOldLibdrizzle()
41
46
{
63
68
  return net.vio != 0;
64
69
}
65
70
 
66
 
void ProtocolOldLibdrizzle::setReadTimeout(uint32_t timeout)
67
 
{
68
 
  drizzleclient_net_set_read_timeout(&net, timeout);
69
 
}
70
 
 
71
 
void ProtocolOldLibdrizzle::setWriteTimeout(uint32_t timeout)
72
 
{
73
 
  drizzleclient_net_set_write_timeout(&net, timeout);
74
 
}
75
 
 
76
 
void ProtocolOldLibdrizzle::setRetryCount(uint32_t count)
77
 
{
78
 
  net.retry_count=count;
79
 
}
80
 
 
81
71
void ProtocolOldLibdrizzle::setError(char error)
82
72
{
83
73
  net.error= error;
437
427
{
438
428
  if (drizzleclient_net_init_sock(&net, fd, 0))
439
429
    return true;
 
430
 
 
431
  drizzleclient_net_set_read_timeout(&net, read_timeout);
 
432
  drizzleclient_net_set_write_timeout(&net, write_timeout);
 
433
  net.retry_count=retry_count;
 
434
 
440
435
  return false;
441
436
}
442
437
 
464
459
  }
465
460
 
466
461
  /* Connect completed, set read/write timeouts back to default */
467
 
  drizzleclient_net_set_read_timeout(&net,
468
 
                                     session->variables.net_read_timeout);
469
 
  drizzleclient_net_set_write_timeout(&net,
470
 
                                      session->variables.net_write_timeout);
 
462
  drizzleclient_net_set_read_timeout(&net, read_timeout);
 
463
  drizzleclient_net_set_write_timeout(&net, write_timeout);
471
464
  return true;
472
465
}
473
466
 
837
830
  return 0;
838
831
}
839
832
 
 
833
static DRIZZLE_SYSVAR_UINT(connect_timeout, connect_timeout,
 
834
                           PLUGIN_VAR_RQCMDARG, N_("Connect Timeout."),
 
835
                           NULL, NULL, 10, 1, 300, 0);
 
836
static DRIZZLE_SYSVAR_UINT(read_timeout, read_timeout, PLUGIN_VAR_RQCMDARG,
 
837
                           N_("Read Timeout."), NULL, NULL, 30, 1, 300, 0);
 
838
static DRIZZLE_SYSVAR_UINT(write_timeout, write_timeout, PLUGIN_VAR_RQCMDARG,
 
839
                           N_("Write Timeout."), NULL, NULL, 60, 1, 300, 0);
 
840
static DRIZZLE_SYSVAR_UINT(retry_count, retry_count, PLUGIN_VAR_RQCMDARG,
 
841
                           N_("Retry Count."), NULL, NULL, 10, 1, 100, 0);
 
842
 
 
843
static struct st_mysql_sys_var* system_variables[]= {
 
844
  DRIZZLE_SYSVAR(connect_timeout),
 
845
  DRIZZLE_SYSVAR(read_timeout),
 
846
  DRIZZLE_SYSVAR(write_timeout),
 
847
  DRIZZLE_SYSVAR(retry_count),
 
848
  NULL
 
849
};
 
850
 
840
851
drizzle_declare_plugin(oldlibdrizzle)
841
852
{
842
853
  "oldlibdrizzle",
844
855
  "Eric Day",
845
856
  "Old libdrizzle Protocol",
846
857
  PLUGIN_LICENSE_GPL,
847
 
  init,   /* Plugin Init */
848
 
  deinit, /* Plugin Deinit */
849
 
  NULL,   /* status variables */
850
 
  NULL,   /* system variables */
851
 
  NULL    /* config options */
 
858
  init,             /* Plugin Init */
 
859
  deinit,           /* Plugin Deinit */
 
860
  NULL,             /* status variables */
 
861
  system_variables, /* system variables */
 
862
  NULL              /* config options */
852
863
}
853
864
drizzle_declare_plugin_end;