diff options
| author | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-21 10:44:59 -0500 |
|---|---|---|
| committer | unknown <pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-03-21 10:44:59 -0500 |
| commit | 88a1cff6efa23159644fba475424e83d3a313c45 (patch) | |
| tree | 5876aed6e233ea5e55356a926f07cf3cb8ec443c /sql/ha_partition.h | |
| parent | b3bdc112688fda9784e7f38073cce28063bb832b (diff) | |
| parent | 26416bf5448f45a171fb1e0e28c425f401b1a0aa (diff) | |
| download | mariadb-git-88a1cff6efa23159644fba475424e83d3a313c45.tar.gz | |
Merge c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/my_sys.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/ha_partition.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/ha_heap.cc:
manual merge
sql/ha_myisammrg.cc:
manual merge
sql/ha_partition.cc:
manual merge
sql/handler.h:
manual merge
sql/log.cc:
manual merge
sql/mysqld.cc:
manual merge
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 32ea75fabf0..295252bd198 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -179,7 +179,8 @@ public: virtual int rename_table(const char *from, const char *to); virtual int create(const char *name, TABLE *form, HA_CREATE_INFO *create_info); - virtual int create_handler_files(const char *name); + virtual int create_handler_files(const char *name, + const char *old_name, bool rename_flag); virtual void update_create_info(HA_CREATE_INFO *create_info); virtual char *update_table_comment(const char *comment); virtual int change_partitions(HA_CREATE_INFO *create_info, |