← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_create.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_create.cc
16
16
/* Create a MyISAM table */
17
17
 
18
18
#include "myisam_priv.h"
19
 
#include "drizzled/internal/my_bit.h"
20
 
#include "drizzled/internal/my_sys.h"
 
19
#include <drizzled/internal/my_bit.h>
 
20
#include <drizzled/internal/my_sys.h>
21
21
 
22
 
#include "drizzled/util/test.h"
23
 
#include "drizzled/global_charset_info.h"
24
 
#include "drizzled/error.h"
 
22
#include <drizzled/util/test.h>
 
23
#include <drizzled/global_charset_info.h>
 
24
#include <drizzled/error.h>
25
25
 
26
26
#include <cassert>
27
27
#include <algorithm>
392
392
  /* There are only 16 bits for the total header length. */
393
393
  if (info_length > 65535)
394
394
  {
395
 
    my_printf_error(0, "MyISAM table '%s' has too many columns and/or "
 
395
    my_printf_error(EE_OK, "MyISAM table '%s' has too many columns and/or "
396
396
                    "indexes and/or unique constraints.",
397
397
                    MYF(0), name + internal::dirname_length(name));
398
398
    errno= HA_WRONG_CREATE_OPTION;
526
526
  */
527
527
  if (test_if_reopen(filename))
528
528
  {
529
 
    my_printf_error(0, "MyISAM table '%s' is in use "
 
529
    my_printf_error(EE_OK, "MyISAM table '%s' is in use "
530
530
                    "(most likely by a MERGE table). Try FLUSH TABLES.",
531
531
                    MYF(0), name + internal::dirname_length(name));
532
532
    errno= HA_ERR_TABLE_EXIST;