← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/mysql_protocol.cc

Merge in Monty/Andrew's boolean MySQL compatible patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
35
35
 
36
36
#include <drizzled/identifier.h>
37
37
 
 
38
#include <libdrizzle/constants.h>
 
39
 
38
40
#define PROTOCOL_VERSION 10
39
41
 
40
42
namespace po= boost::program_options;
558
560
        break;
559
561
 
560
562
      case DRIZZLE_TYPE_BOOLEAN:
561
 
        pos[6]= 15;
 
563
        pos[6]= DRIZZLE_COLUMN_TYPE_TINY;
562
564
        break;
563
565
 
564
566
      case DRIZZLE_TYPE_DECIMAL:
609
611
{
610
612
  if (from->is_null())
611
613
    return store();
 
614
  if (from->type() == DRIZZLE_TYPE_BOOLEAN)
 
615
  {
 
616
    return store(from->val_int());
 
617
  }
 
618
 
612
619
  char buff[MAX_FIELD_WIDTH];
613
620
  String str(buff,sizeof(buff), &my_charset_bin);
614
621