← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Lee Bieber
  • Date: 2011-04-17 02:05:51 UTC
  • mfrom: (2279.1.3 build)
  • Revision ID: kalebral@gmail.com-20110417020551-59m0hx1p10b0up1x
Merge Joe - 760367: DATA_DICTIONARY.CUMULATIVE_USER_STATS.CONNECTED_TIME_SEC reports bogus results
Merge Olaf - Refactor Catalog Cache
Merge Olaf - Delete unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
29
29
#include <sstream>
30
30
#include <string>
31
31
 
32
 
namespace drizzled
33
 
{
 
32
namespace drizzled {
34
33
 
35
34
/****************************************************************************
36
35
** enum type.
208
207
  Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
209
208
  if (res)
210
209
  {
211
 
    res->typelib= typelib->copy_typelib(root);
 
210
    res->typelib= typelib->copy_typelib(*root);
212
211
  }
213
212
  return res;
214
213
}