Merge 5.1-bugteam -> 5.1-innodb_plugin.

This commit is contained in:
Sergey Vojtovich 2009-07-14 15:06:04 +05:00
commit 058cd62565
388 changed files with 9440 additions and 3521 deletions

View file

@ -419,6 +419,14 @@ int ha_heap::delete_all_rows()
return 0;
}
int ha_heap::reset_auto_increment(ulonglong value)
{
file->s->auto_increment= value;
return 0;
}
int ha_heap::external_lock(THD *thd, int lock_type)
{
return 0; // No external locking

View file

@ -98,6 +98,7 @@ public:
int reset();
int external_lock(THD *thd, int lock_type);
int delete_all_rows(void);
int reset_auto_increment(ulonglong value);
int disable_indexes(uint mode);
int enable_indexes(uint mode);
int indexes_are_disabled(void);