diff options
| author | unknown <guilhem@mysql.com> | 2004-06-10 16:42:07 +0200 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2004-06-10 16:42:07 +0200 |
| commit | bfe7ebee3c91739ea58fba711e982618a9253439 (patch) | |
| tree | 2dbd19f26f3f1810effa6c2e6f2b07f546d8f859 /sql/ha_innodb.cc | |
| parent | d8f0df52d307ba3d1aea9c3d9a125c9439e22e33 (diff) | |
| parent | 78492226529495f2dcac22e0dcd2a32c2956bb9a (diff) | |
| download | mariadb-git-bfe7ebee3c91739ea58fba711e982618a9253439.tar.gz | |
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-874
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'sql/ha_innodb.cc')
| -rw-r--r-- | sql/ha_innodb.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 6ff468cdbb8..483ada5364c 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4331,9 +4331,8 @@ ha_innobase::analyze( } /************************************************************************** -This is currently mapped to ::analyze. A better option would be to map this -to "ALTER TABLE tablename TYPE=InnoDB", which seems to rebuild the table in -MySQL. */ +This is mapped to "ALTER TABLE tablename TYPE=InnoDB", which rebuilds +the table in MySQL. */ int ha_innobase::optimize( @@ -4341,7 +4340,7 @@ ha_innobase::optimize( THD* thd, /* in: connection thread handle */ HA_CHECK_OPT* check_opt) /* in: currently ignored */ { - return(ha_innobase::analyze(thd, check_opt)); + return(HA_ADMIN_TRY_ALTER); } /*********************************************************************** |