summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Ronstrom <mikael@mysql.com>2009-10-19 09:10:25 +0200
committerMikael Ronstrom <mikael@mysql.com>2009-10-19 09:10:25 +0200
commit8cf025ec3fc27f912df7390e57e93d1f06aa3daa (patch)
treeb2c4c6e36a3944307450f79bba3c345f10f3d842
parentd52305530cd24297326784a068d72bd92e1d7023 (diff)
downloadmariadb-git-8cf025ec3fc27f912df7390e57e93d1f06aa3daa.tar.gz
Fix for non-partition builds
-rw-r--r--sql/partition_info.cc20
1 files changed, 20 insertions, 0 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index 871ce4b8e45..c6356896cf7 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -1615,5 +1615,25 @@ id_err:
return 1;
}
+#else /* WITH_PARTITION_STORAGE_ENGINE */
+ /*
+ For builds without partitioning we need to define these functions
+ since we they are called from the parser. The parser cannot
+ remove code parts using ifdef, but the code parts cannot be called
+ so we simply need to add empty functions to make the linker happy.
+ */
+part_column_list_val *partition_info::add_column_value()
+{
+ return NULL;
+}
+bool partition_info::set_part_expr(char *start_token, Item *item_ptr,
+ char *end_token, bool is_subpart)
+{
+ (void)start_token;
+ (void)item_ptr;
+ (void)end_token;
+ (void)is_subpart;
+ return FALSE;
+}
#endif /* WITH_PARTITION_STORAGE_ENGINE */