← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

fixed build warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
21
21
 
22
22
/*****************************************************************************
23
23
 
24
 
Copyright (c) 2000, 2009, MySQL AB & Innobase Oy. All Rights Reserved.
25
 
Copyright (c) 2008, 2009 Google Inc.
 
24
Copyright (C) 2000, 2009, MySQL AB & Innobase Oy. All Rights Reserved.
 
25
Copyright (C) 2008, 2009 Google Inc.
26
26
 
27
27
Portions of this file contain modifications contributed and copyrighted by
28
28
Google, Inc. Those modifications are gratefully acknowledged and are described
45
45
*****************************************************************************/
46
46
/***********************************************************************
47
47
 
48
 
Copyright (c) 1995, 2009, Innobase Oy. All Rights Reserved.
49
 
Copyright (c) 2009, Percona Inc.
 
48
Copyright (C) 1995, 2009, Innobase Oy. All Rights Reserved.
 
49
Copyright (C) 2009, Percona Inc.
50
50
 
51
51
Portions of this file contain modifications contributed and copyrighted
52
52
by Percona Inc.. Those modifications are
101
101
#include "haildb_engine.h"
102
102
 
103
103
#include <drizzled/field.h>
104
 
#include "drizzled/field/timestamp.h" // needed for UPDATE NOW()
105
104
#include "drizzled/field/blob.h"
106
105
#include "drizzled/field/enum.h"
107
106
#include <drizzled/session.h>
486
485
  else
487
486
  {
488
487
    assert (err == DB_SUCCESS);
489
 
    err= ib_tuple_read_u64(tuple, getTable()->getShare()->fields, &nr);
 
488
    err= ib_tuple_read_u64(tuple, getTable()->getShare()->sizeFields(), &nr);
490
489
    nr++;
491
490
  }
492
491
  ib_tuple_delete(tuple);
927
926
    *err= ib_table_schema_add_col(schema, field.name().c_str(), IB_INT,
928
927
                                  column_attr, 0, 4);
929
928
    break;
930
 
  case message::Table::Field::TIMESTAMP:
 
929
  case message::Table::Field::EPOCH:
931
930
    *err= ib_table_schema_add_col(schema, field.name().c_str(), IB_INT,
932
931
                                  column_attr, 0, 8);
933
932
    break;
1972
1971
 
1973
1972
  if (share->has_hidden_primary_key)
1974
1973
  {
1975
 
    err= ib_tuple_write_u64(tuple, getTable()->getShare()->fields, share->hidden_pkey_auto_increment_value.fetch_and_increment());
 
1974
    err= ib_tuple_write_u64(tuple, getTable()->getShare()->sizeFields(),
 
1975
                            share->hidden_pkey_auto_increment_value.fetch_and_increment());
1976
1976
  }
1977
1977
 
1978
1978
  err= ib_cursor_insert_row(cursor, tuple);
2513
2513
 
2514
2514
    err= ib_get_duplicate_key(transaction, &err_table_name, &err_index_name);
2515
2515
 
2516
 
    errkey= -1;
 
2516
    errkey= UINT32_MAX;
2517
2517
 
2518
2518
    for (unsigned int i = 0; i < getTable()->getShare()->keys; i++)
2519
2519
    {