← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Brian Aker
  • Date: 2009-12-01 02:39:03 UTC
  • mfrom: (1234.1.4 push)
  • Revision ID: brian@gaz-20091201023903-1id5z7xnup695jaq
Merge of Brian + Jay test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
244
244
public:
245
245
  InnobaseEngine(string name_arg)
246
246
   : drizzled::plugin::StorageEngine(name_arg,
 
247
                                     HTON_NULL_IN_KEY |
 
248
                                     HTON_CAN_INDEX_BLOBS |
 
249
                                     HTON_PRIMARY_KEY_REQUIRED_FOR_POSITION |
 
250
                                     HTON_PRIMARY_KEY_IN_READ_INDEX |
 
251
                                     HTON_PARTIAL_COLUMN_READ |
 
252
                                     HTON_TABLE_SCAN_ON_INDEX |
 
253
                                     HTON_MRR_CANT_SORT |
247
254
                                     HTON_HAS_DOES_TRANSACTIONS, sizeof(trx_named_savept_t))
248
255
  {
249
256
    table_definition_ext= drizzled::plugin::DEFAULT_DEFINITION_FILE_EXT;
250
257
    addAlias("INNOBASE");
251
258
  }
252
259
 
253
 
  uint64_t table_flags() const
254
 
  {
255
 
    return (HA_NULL_IN_KEY |
256
 
            HA_CAN_INDEX_BLOBS |
257
 
            HA_PRIMARY_KEY_REQUIRED_FOR_POSITION |
258
 
            HA_PRIMARY_KEY_IN_READ_INDEX |
259
 
            HA_PARTIAL_COLUMN_READ |
260
 
            HA_TABLE_SCAN_ON_INDEX | 
261
 
            HA_MRR_CANT_SORT);
262
 
  }
263
 
 
264
260
  virtual
265
261
  int
266
262
  close_connection(
271
267
 
272
268
  virtual int savepoint_set_hook(Session* session,
273
269
                                 void *savepoint);
274
 
  virtual int savepoint_rollback_hook(Session* session, 
 
270
  virtual int savepoint_rollback_hook(Session* session,
275
271
                                      void *savepoint);
276
 
  virtual int savepoint_release_hook(Session* session, 
 
272
  virtual int savepoint_release_hook(Session* session,
277
273
                                     void *savepoint);
278
274
  virtual int commit(Session* session, bool all);
279
275
  virtual int rollback(Session* session, bool all);
391
387
 
392
388
  UNIV_INTERN virtual bool get_error_message(int error, String *buf);
393
389
 
 
390
  UNIV_INTERN uint32_t max_supported_keys() const;
 
391
  UNIV_INTERN uint32_t max_supported_key_length() const;
 
392
  UNIV_INTERN uint32_t max_supported_key_part_length() const;
394
393
};
395
394
 
396
395
/** @brief Initialize the default value of innodb_commit_concurrency.
2533
2532
@return MAX_KEY */
2534
2533
UNIV_INTERN
2535
2534
uint
2536
 
ha_innobase::max_supported_keys() const
 
2535
InnobaseEngine::max_supported_keys() const
2537
2536
/*===================================*/
2538
2537
{
2539
2538
        return(MAX_KEY);
2544
2543
@return maximum supported key length, in bytes */
2545
2544
UNIV_INTERN
2546
2545
uint32_t
2547
 
ha_innobase::max_supported_key_length() const
 
2546
InnobaseEngine::max_supported_key_length() const
2548
2547
/*=========================================*/
2549
2548
{
2550
2549
        /* An InnoDB page must store >= 2 keys; a secondary key record
2903
2902
 
2904
2903
UNIV_INTERN
2905
2904
uint32_t
2906
 
ha_innobase::max_supported_key_part_length() const
 
2905
InnobaseEngine::max_supported_key_part_length() const
2907
2906
{
2908
2907
        return(DICT_MAX_INDEX_COL_LEN - 1);
2909
2908
}