← Back to branch summary

~shubhamsomani92/drizzle/trunk-bug-995739

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Continuous Integration
  • Date: 2013-03-07 03:15:07 UTC
  • mfrom: (2630.1.7 create-tmp-table)
  • Revision ID: ci@drizzle.org-20130307031507-bqgrashrp5m3fw8x
Merge lp:~stewart/drizzle/misc-cleanups Build: jenkins-Drizzle-Builder-175

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
38
38
#include <drizzled/key.h>
39
39
#include <drizzled/statistics_variables.h>
40
40
#include <drizzled/system_variables.h>
 
41
#include <drizzled/key_part_info.h>
41
42
 
42
43
#include <boost/algorithm/string.hpp>
43
44
#include <boost/scoped_ptr.hpp>
121
122
  uint32_t max_supported_key_length()    const { return MI_MAX_KEY_LENGTH; }
122
123
  uint32_t max_supported_key_part_length() const { return MI_MAX_KEY_LENGTH; }
123
124
 
124
 
  uint32_t index_flags(enum  ha_key_alg) const
 
125
  uint32_t index_flags(drizzled::message::Table::Index::IndexType) const
125
126
  {
126
127
    return (HA_READ_NEXT |
127
128
            HA_READ_PREV |
223
224
  {
224
225
    KeyInfo *pos= &table_arg->key_info[i];
225
226
    keydef[i].flag= ((uint16_t) pos->flags & (HA_NOSAME));
226
 
    keydef[i].key_alg= HA_KEY_ALG_BTREE;
 
227
    keydef[i].key_alg= message::Table::Index::BTREE;
227
228
    keydef[i].block_length= pos->block_size;
228
229
    keydef[i].seg= keyseg;
229
230
    keydef[i].keysegs= pos->key_parts;
589
590
  if (!(file= mi_open(identifier, mode, test_if_locked)))
590
591
    return (errno ? errno : -1);
591
592
 
592
 
  if (!getTable()->getShare()->getType()) /* No need to perform a check for tmp table */
 
593
  if (getTable()->getShare()->getType() == message::Table::STANDARD)
593
594
  {
594
595
    if ((errno= table2myisam(getTable(), &keyinfo, &recinfo, &recs)))
595
596
    {