← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
80
80
#include <drizzled/field/microtime.h>
81
81
#include <drizzled/field/varstring.h>
82
82
#include <drizzled/field/uuid.h>
83
 
 
84
83
#include <drizzled/plugin/storage_engine.h>
85
 
 
86
84
#include <drizzled/definition/cache.h>
87
85
#include <drizzled/typelib.h>
88
 
 
89
86
#include <drizzled/refresh_version.h>
 
87
#include <drizzled/key.h>
90
88
 
91
89
using namespace std;
92
90
 
168
166
                                                                NULL,
169
167
                                                                &error),
170
168
                               default_value->length());
 
169
 
 
170
    if (error && error != -1) /* was an error and wasn't a negative number */
 
171
    {
 
172
      delete default_item;
 
173
      return NULL;
 
174
    }
 
175
 
171
176
    break;
172
177
  case DRIZZLE_TYPE_DOUBLE:
173
178
    default_item= new Item_float(default_value->c_str(),
581
586
  getTableMessage()->set_schema(identifier_arg.getSchemaName());
582
587
}
583
588
 
584
 
bool TableShare::parse_table_proto(Session& session, message::Table &table)
 
589
bool TableShare::parse_table_proto(Session& session, const message::Table &table)
585
590
{
586
591
  drizzled::error_t local_error= EE_OK;
587
592
 
1081
1086
                                        pfield.options().default_null(),
1082
1087
                                        &pfield.options().default_value(),
1083
1088
                                        &pfield.options().default_bin_value());
 
1089
      if (default_value == NULL)
 
1090
      {
 
1091
        my_error(ER_INVALID_DEFAULT, MYF(0), pfield.name().c_str());
 
1092
        return true;
 
1093
      }
1084
1094
    }
1085
1095
 
1086
1096