diff options
Diffstat (limited to 'innobase/include')
| -rw-r--r-- | innobase/include/fil0fil.h | 2 | ||||
| -rw-r--r-- | innobase/include/row0mysql.h | 2 | ||||
| -rw-r--r-- | innobase/include/ut0mem.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/innobase/include/fil0fil.h b/innobase/include/fil0fil.h index 310336af38e..f7cdeb7f195 100644 --- a/innobase/include/fil0fil.h +++ b/innobase/include/fil0fil.h @@ -19,7 +19,7 @@ Created 10/25/1995 Heikki Tuuri /* When mysqld is run, the default directory "." is the mysqld datadir, but in ibbackup we must set it explicitly; the patgh must NOT contain the trailing '/' or '\' */ -extern char* fil_path_to_mysql_datadir; +extern const char* fil_path_to_mysql_datadir; /* Initial size of a single-table tablespace in pages */ #define FIL_IBD_FILE_INITIAL_SIZE 4 diff --git a/innobase/include/row0mysql.h b/innobase/include/row0mysql.h index 13898e75216..0fb2994a414 100644 --- a/innobase/include/row0mysql.h +++ b/innobase/include/row0mysql.h @@ -339,6 +339,8 @@ row_drop_table_for_mysql( char* name, /* in: table name */ trx_t* trx, /* in: transaction handle */ ibool drop_db);/* in: TRUE=dropping whole database */ + +/************************************************************************* Discards the tablespace of a table which stored in an .ibd file. Discarding means that this function deletes the .ibd file and assigns a new table id for the table. Also the flag table->ibd_file_missing is set TRUE. diff --git a/innobase/include/ut0mem.h b/innobase/include/ut0mem.h index 7ca2c26e840..b208fac8691 100644 --- a/innobase/include/ut0mem.h +++ b/innobase/include/ut0mem.h @@ -128,6 +128,8 @@ ut_str_catenate( /* out, own: catenated null-terminated string */ char* str1, /* in: null-terminated string */ char* str2); /* in: null-terminated string */ + +/************************************************************************** Return a copy of the given string. The returned string must be freed using mem_free. */ @@ -136,7 +138,6 @@ ut_strdup( /*======*/ /* out, own: cnull-terminated string */ char* str); /* in: null-terminated string */ -/************************************************************************** #ifndef UNIV_NONINL #include "ut0mem.ic" |