diff options
author | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
---|---|---|
committer | unknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-02-21 08:03:52 -0500 |
commit | 26416bf5448f45a171fb1e0e28c425f401b1a0aa (patch) | |
tree | cd8b06154812c8fdd31ac76addbb7e0f2ce187c6 /sql/ha_ndbcluster.h | |
parent | 5c9afee608aef412065a90b10032d5ce23c12b1d (diff) | |
parent | a95646be8d1d56b8ee68ae991ba3c760d9071b94 (diff) | |
download | mariadb-git-26416bf5448f45a171fb1e0e28c425f401b1a0aa.tar.gz |
Merge c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-bugs
into c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'sql/ha_ndbcluster.h')
-rw-r--r-- | sql/ha_ndbcluster.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index 1eb8ac1ea70..e9aebcdd68c 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -611,7 +611,8 @@ class ha_ndbcluster: public handler int rename_table(const char *from, const char *to); int delete_table(const char *name); int create(const char *name, TABLE *form, HA_CREATE_INFO *info); - int create_handler_files(const char *file); + int create_handler_files(const char *file, const char *old_name, + bool rename_flag); int get_default_no_partitions(ulonglong max_rows); bool get_no_parts(const char *name, uint *no_parts); void set_auto_partitions(partition_info *part_info); |