summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-03-16 13:59:44 +0100
committerSergei Golubchik <sergii@pisem.net>2014-03-16 13:59:44 +0100
commite772cbd7b774add42821c33b13ea052f8c9e2e6e (patch)
tree0411c732161ad4fc4f49a02ee78abaa6632c6d4d /sql/ha_partition.h
parent8428c116c7cc1fb6a04345637a10084810874dd8 (diff)
parentd7304375e5e0ce30979c2b92e70eb0effaa30a25 (diff)
downloadmariadb-git-e772cbd7b774add42821c33b13ea052f8c9e2e6e.tar.gz
5.1 merge
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index c33216047b3..e306c2edbad 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -286,7 +286,7 @@ private:
delete_table, rename_table and create uses very similar logic which
is packed into this routine.
*/
- uint del_ren_cre_table(const char *from, const char *to,
+ int del_ren_cre_table(const char *from, const char *to,
TABLE *table_arg, HA_CREATE_INFO *create_info);
/*
One method to create the table_name.par file containing the names of the