diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 12:40:09 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-08-25 12:40:09 +0200 |
| commit | 6b1863b8304662189a3b9a4aef1e1bebef035b86 (patch) | |
| tree | 48ba2cbdda863b644108e93ace3668333ae0d193 /sql/sql_table.h | |
| parent | ea91bb6801b1b619d64fa137ea351eca9de683ec (diff) | |
| parent | 5bbe929d706e26cb3f9b291da6009526a17b1545 (diff) | |
| download | mariadb-git-6b1863b8304662189a3b9a4aef1e1bebef035b86.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'sql/sql_table.h')
| -rw-r--r-- | sql/sql_table.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_table.h b/sql/sql_table.h index a8124177840..474fe9cd90b 100644 --- a/sql/sql_table.h +++ b/sql/sql_table.h @@ -247,7 +247,8 @@ bool log_drop_table(THD *thd, const char *db_name, size_t db_name_length, const char *table_name, size_t table_name_length, bool temporary_table); bool quick_rm_table(THD *thd, handlerton *base, const char *db, - const char *table_name, uint flags); + const char *table_name, uint flags, + const char *table_path=0); void close_cached_table(THD *thd, TABLE *table); void sp_prepare_create_field(THD *thd, Create_field *sql_field); int prepare_create_field(Create_field *sql_field, |