← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2011-02-17 00:14:13 UTC
  • mto: This revision was merged to the branch mainline in revision 2178.
  • Revision ID: mordred@inaugust.com-20110217001413-4ir91t7xgfo87rkd
https://launchpad.net/bugs/715986
Fixes incorrect usage of include

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
15
15
 
16
16
/* drop and alter of tables */
17
17
 
18
 
#include "config.h"
 
18
#include <config.h>
19
19
#include <plugin/myisam/myisam.h>
20
20
#include <drizzled/show.h>
21
21
#include <drizzled/error.h>
26
26
#include <drizzled/sql_lex.h>
27
27
#include <drizzled/session.h>
28
28
#include <drizzled/sql_base.h>
29
 
#include "drizzled/strfunc.h"
30
 
#include <drizzled/db.h>
 
29
#include <drizzled/strfunc.h>
31
30
#include <drizzled/lock.h>
32
31
#include <drizzled/unireg.h>
33
32
#include <drizzled/item/int.h>
34
33
#include <drizzled/item/empty_string.h>
35
34
#include <drizzled/transaction_services.h>
36
 
#include "drizzled/transaction_services.h"
 
35
#include <drizzled/transaction_services.h>
37
36
#include <drizzled/table_proto.h>
38
37
#include <drizzled/plugin/client.h>
39
38
#include <drizzled/identifier.h>
40
 
#include "drizzled/internal/m_string.h"
41
 
#include "drizzled/global_charset_info.h"
42
 
#include "drizzled/charset.h"
43
 
 
44
 
#include "drizzled/definition/cache.h"
45
 
 
46
 
 
47
 
#include "drizzled/statement/alter_table.h"
48
 
#include "drizzled/sql_table.h"
49
 
#include "drizzled/pthread_globals.h"
50
 
#include "drizzled/plugin/storage_engine.h"
 
39
#include <drizzled/internal/m_string.h>
 
40
#include <drizzled/global_charset_info.h>
 
41
#include <drizzled/charset.h>
 
42
 
 
43
#include <drizzled/definition/cache.h>
 
44
 
 
45
#include <drizzled/statement/alter_table.h>
 
46
#include <drizzled/sql_table.h>
 
47
#include <drizzled/pthread_globals.h>
 
48
#include <drizzled/typelib.h>
 
49
#include <drizzled/plugin/storage_engine.h>
51
50
 
52
51
#include <algorithm>
53
52
#include <sstream>
686
685
          else /* not NULL */
687
686
          {
688
687
            def->length(cs->cset->lengthsp(cs, def->ptr(), def->length()));
689
 
            if (find_type2(interval, def->ptr(), def->length(), cs) == 0) /* not found */
 
688
            if (interval->find_type2(def->ptr(), def->length(), cs) == 0) /* not found */
690
689
            {
691
690
              my_error(ER_INVALID_DEFAULT, MYF(0), sql_field->field_name);
692
691
              return(true);
1231
1230
 
1232
1231
    if (session->variables.sql_mode & MODE_NO_ZERO_DATE &&
1233
1232
        !sql_field->def &&
1234
 
        sql_field->sql_type == DRIZZLE_TYPE_TIMESTAMP &&
 
1233
        (sql_field->sql_type == DRIZZLE_TYPE_TIMESTAMP  or sql_field->sql_type == DRIZZLE_TYPE_MICROTIME) &&
1235
1234
        (sql_field->flags & NOT_NULL_FLAG) &&
1236
1235
        (type == Field::NONE || type == Field::TIMESTAMP_UN_FIELD))
1237
1236
    {
2002
2001
  // a "new" message and it will not have all of the information that the
2003
2002
  // source table message would have.
2004
2003
  message::Table new_table_message;
2005
 
  drizzled::error_t error;
2006
2004
 
2007
 
  message::table::shared_ptr source_table_message= plugin::StorageEngine::getTableMessage(session, source_identifier, error);
 
2005
  message::table::shared_ptr source_table_message= plugin::StorageEngine::getTableMessage(session, source_identifier);
2008
2006
 
2009
2007
  if (not source_table_message)
2010
2008
  {