diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-10-03 21:39:04 +0000 |
| commit | ec81fca2d08a4cb9532aef7404c480f34fe145cb (patch) | |
| tree | aba1618cac773466e58a7ff45f66bb205fe52130 /sql/mysql_priv.h | |
| parent | 52d5c01d8742960c23bc06be6b046da6e9951694 (diff) | |
| parent | 341d8aaee39951dfd771db2b0da9a689149facf1 (diff) | |
| download | mariadb-git-ec81fca2d08a4cb9532aef7404c480f34fe145cb.tar.gz | |
Merge
BitKeeper/etc/logging_ok:
auto-union
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/mysql-test-run.sh:
SCCS merged
sql/ha_ndbcluster.cc:
SCCS merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e5aa638ca35..5d04d145563 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1005,8 +1005,6 @@ int openfrm(const char *name,const char *alias,uint filestat,uint prgflag, uint ha_open_flags, TABLE *outparam); int readfrm(const char *name, const void** data, uint* length); int writefrm(const char* name, const void* data, uint len); -int create_table_from_handler(const char *db, const char *name, - bool create_if_found); int closefrm(TABLE *table); db_type get_table_type(const char *name); int read_string(File file, gptr *to, uint length); |