← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.h

  • Committer: Brian Aker
  • Date: 2010-10-20 20:26:18 UTC
  • mfrom: (1859.2.13 refactor)
  • Revision ID: brian@tangent.org-20101020202618-9222n39lm329urv5
Merge for Brian 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.h
198
198
public:
199
199
  bool doesKeyNameExist(const char *name_arg, uint32_t name_length, uint32_t &position) const
200
200
  {
201
 
    std::string arg(name_arg, name_length);
202
 
    std::transform(arg.begin(), arg.end(),
203
 
                   arg.begin(), ::toupper);
204
 
 
205
 
    std::vector<std::string>::const_iterator iter= std::find(_keynames.begin(), _keynames.end(), arg);
206
 
 
207
 
    if (iter == _keynames.end())
208
 
      return false;
209
 
 
210
 
    position= iter -  _keynames.begin();
211
 
 
212
 
    return true;
 
201
    return doesKeyNameExist(std::string(name_arg, name_length), position);
213
202
  }
214
203
 
215
204
  bool doesKeyNameExist(std::string arg, uint32_t &position) const
690
679
                            const char *alias,
691
680
                            uint32_t db_stat, uint32_t ha_open_flags,
692
681
                            Table &outparam);
 
682
private:
 
683
  int open_table_from_share_inner(Session *session,
 
684
                                  const char *alias,
 
685
                                  uint32_t db_stat, uint32_t ha_open_flags,
 
686
                                  Table &outparam,
 
687
                                  bool &error_reported);
 
688
  int open_table_cursor_inner(Session *session,
 
689
                              const TableIdentifier &identifier,
 
690
                              const char *alias,
 
691
                              uint32_t db_stat, uint32_t ha_open_flags,
 
692
                              Table &outparam,
 
693
                              bool &error_reported);
 
694
public:
693
695
  int parse_table_proto(Session& session, message::Table &table);
694
696
private:
695
697
  int inner_parse_table_proto(Session& session, message::Table &table);