summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorunknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-11 00:41:52 -0500
committerunknown <pappa@c-9a08e253.1238-1-64736c10.cust.bredbandsbolaget.se>2006-02-11 00:41:52 -0500
commitb517dbf7183a16101b901f29f0a0d9acfac177ce (patch)
tree481d93e4de154fa419b124101082105237c13ede /sql/ha_partition.cc
parentc6d1dee7e3decd33735d593d23f0ff280655f016 (diff)
downloadmariadb-git-b517dbf7183a16101b901f29f0a0d9acfac177ce.tar.gz
Compile fixes
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 22d092b486e..af6ce9cd1e0 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -101,7 +101,9 @@ handlerton partition_hton = {
partition_flags, /* Partition flags */
alter_table_flags, /* Partition flags */
NULL, /* Alter Tablespace */
- HTON_NOT_USER_SELECTABLE | HTON_HIDDEN
+ HTON_NOT_USER_SELECTABLE | HTON_HIDDEN,
+ NULL, /* binlog function */
+ NULL /* binlog query */
};
/*
@@ -495,10 +497,9 @@ int ha_partition::create_handler_files(const char *path,
{
char name[FN_REFLEN];
char old_name[FN_REFLEN];
- char *par_str= ".par";
- strxmov(name, path, par_str, NullS);
- strxmov(old_name, old_path, par_str, NullS);
+ strxmov(name, path, ha_par_ext, NullS);
+ strxmov(old_name, old_path, ha_par_ext, NullS);
if (my_delete(name, MYF(MY_WME)) ||
my_rename(old_name, name, MYF(MY_WME)))
{
@@ -763,7 +764,7 @@ int ha_partition::rename_partitions(const char *path)
if (file->delete_table((const char *) norm_name_buff) ||
inactivate_table_log_entry(sub_elem->log_entry->entry_pos))
error= 1;
- VOID(synch_table_log());
+ VOID(sync_table_log());
}
file= m_new_file[part];
create_subpartition_name(part_name_buff, path,
@@ -792,7 +793,7 @@ int ha_partition::rename_partitions(const char *path)
if (file->delete_table((const char *) norm_name_buff) ||
inactivate_table_log_entry(part_elem->log_entry->entry_pos))
error= 1;
- VOID(synch_table_log());
+ VOID(sync_table_log());
}
file= m_new_file[i];
create_partition_name(part_name_buff, path,
@@ -809,7 +810,7 @@ int ha_partition::rename_partitions(const char *path)
}
}
} while (++i < no_parts);
- VOID(synch_table_log());
+ VOID(sync_table_log());
DBUG_RETURN(error);
}