← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/oldlibdrizzle.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/oldlibdrizzle.cc
36
36
 
37
37
#define PROTOCOL_VERSION 10
38
38
 
 
39
namespace drizzled
 
40
{
39
41
extern uint32_t global_thread_id;
 
42
}
40
43
 
41
44
static const unsigned int PACKET_BUFFER_EXTRA_ALLOC= 1024;
42
45
static uint32_t port;
558
561
{
559
562
  char buff[12];
560
563
  return netStoreData((unsigned char*) buff,
561
 
                      (size_t) (int10_to_str(from, buff, -10) - buff));
 
564
                      (size_t) (internal::int10_to_str(from, buff, -10) - buff));
562
565
}
563
566
 
564
567
bool ClientMySQLProtocol::store(uint32_t from)
565
568
{
566
569
  char buff[11];
567
570
  return netStoreData((unsigned char*) buff,
568
 
                      (size_t) (int10_to_str(from, buff, 10) - buff));
 
571
                      (size_t) (internal::int10_to_str(from, buff, 10) - buff));
569
572
}
570
573
 
571
574
bool ClientMySQLProtocol::store(int64_t from)
572
575
{
573
576
  char buff[22];
574
577
  return netStoreData((unsigned char*) buff,
575
 
                      (size_t) (int64_t10_to_str(from, buff, -10) - buff));
 
578
                      (size_t) (internal::int64_t10_to_str(from, buff, -10) - buff));
576
579
}
577
580
 
578
581
bool ClientMySQLProtocol::store(uint64_t from)
579
582
{
580
583
  char buff[21];
581
584
  return netStoreData((unsigned char*) buff,
582
 
                      (size_t) (int64_t10_to_str(from, buff, 10) - buff));
 
585
                      (size_t) (internal::int64_t10_to_str(from, buff, 10) - buff));
583
586
}
584
587
 
585
588
bool ClientMySQLProtocol::store(double from, uint32_t decimals, String *buffer)
826
829
static DRIZZLE_SYSVAR_STR(bind_address, bind_address, PLUGIN_VAR_READONLY,
827
830
                          N_("Address to bind to."), NULL, NULL, NULL);
828
831
 
829
 
static drizzle_sys_var* system_variables[]= {
 
832
static drizzle_sys_var* sys_variables[]= {
830
833
  DRIZZLE_SYSVAR(port),
831
834
  DRIZZLE_SYSVAR(connect_timeout),
832
835
  DRIZZLE_SYSVAR(read_timeout),
848
851
  init,             /* Plugin Init */
849
852
  deinit,           /* Plugin Deinit */
850
853
  NULL,             /* status variables */
851
 
  system_variables, /* system variables */
 
854
  sys_variables, /* system variables */
852
855
  NULL              /* config options */
853
856
}
854
857
DRIZZLE_DECLARE_PLUGIN_END;