~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Lee Bieber
  • Date: 2011-03-22 17:41:09 UTC
  • mfrom: (2241.2.18 refactor2)
  • Revision ID: kalebral@gmail.com-20110322174109-1bsfvv4q1dnfd089
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
54
54
#include <drizzled/item/float.h>
55
55
#include <drizzled/item/null.h>
56
56
#include <drizzled/temporal.h>
57
 
 
58
57
#include <drizzled/refresh_version.h>
59
 
 
60
58
#include <drizzled/table/singular.h>
61
 
 
62
59
#include <drizzled/table_proto.h>
63
60
#include <drizzled/typelib.h>
 
61
#include <drizzled/sql_lex.h>
64
62
 
65
63
using namespace std;
66
64
 
67
 
namespace drizzled
68
 
{
 
65
namespace drizzled {
69
66
 
70
67
extern plugin::StorageEngine *heap_engine;
71
68
extern plugin::StorageEngine *myisam_engine;
1690
1687
    are fixed in Item_field constructor.
1691
1688
  */
1692
1689
  for (Field **ptr= field; *ptr; ptr++)
1693
 
  {
1694
 
    Item_field *item= new Item_field(*ptr);
1695
 
    if (!item || item_list->push_back(item))
1696
 
      return true;
1697
 
  }
1698
 
  return false;
 
1690
    item_list->push_back(new Item_field(*ptr));
 
1691
  return false; // todo: return void
1699
1692
}
1700
1693
 
1701
1694