diff options
| author | unknown <bell@sanja.is.com.ua> | 2006-06-01 23:25:23 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2006-06-01 23:25:23 +0300 |
| commit | 601239683db356ac2c0847e4d3a35c80034950b2 (patch) | |
| tree | 71971a32145e7efdd8939bd9eda4fdeede810794 /sql/ha_innodb.cc | |
| parent | 33b00ea51d2fed717cf8c528871d71e9ead4470b (diff) | |
| parent | 1101cda353093dc3c22e214452b8a98ad452f2c3 (diff) | |
| download | mariadb-git-601239683db356ac2c0847e4d3a35c80034950b2.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
sql/handler.h:
Auto merged
sql/ha_berkeley.cc:
merge
sql/ha_federated.cc:
merge
sql/ha_heap.cc:
merge
sql/ha_innodb.cc:
merge
sql/ha_myisam.cc:
merge
sql/ha_myisammrg.cc:
merge
sql/ha_ndbcluster.cc:
merge
sql/ha_partition.cc:
merge
sql/handler.cc:
merge
sql/log.cc:
merge
storage/archive/ha_archive.cc:
merge
storage/blackhole/ha_blackhole.cc:
merge
storage/csv/ha_tina.cc:
merge
storage/example/ha_example.cc:
merge
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 4be8a81b845..58249cf9f9a 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -205,7 +205,6 @@ static int innobase_release_savepoint(THD* thd, void *savepoint); static handler *innobase_create_handler(TABLE_SHARE *table); static const char innobase_hton_name[]= "InnoDB"; - handlerton innobase_hton; static handler *innobase_create_handler(TABLE_SHARE *table) |