diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-01 13:04:47 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-01 13:04:47 +0100 |
| commit | 1fd551adff53c0e995d351aa0f0f5d989f3523b8 (patch) | |
| tree | b89ce772a833d56bd55658a8a9e7d3b26a7ce8ff /sql/handler.h | |
| parent | 0b88ef9dc707ff97d87f44d45366f18b6c7fb565 (diff) | |
| parent | bd9bb91a924c778c58944ac6bddfbb05572525f9 (diff) | |
| download | mariadb-git-1fd551adff53c0e995d351aa0f0f5d989f3523b8.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql51
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index 83dbdb19545..2702044e082 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1713,8 +1713,8 @@ public: { return FALSE; } virtual char* get_foreign_key_create_info() { return(NULL);} /* gets foreign key create string from InnoDB */ - virtual char* get_tablespace_create_info() - { return(NULL);} /* gets tablespace create string from handler */ + virtual char* get_tablespace_name() + { return(NULL);} /* gets tablespace name from handler */ /* used in ALTER TABLE; 1 if changing storage engine is allowed */ virtual bool can_switch_engines() { return 1; } /* used in REPLACE; is > 0 if table is referred by a FOREIGN KEY */ |