summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorunknown <mikael/pappa@dator5.(none)>2006-10-02 15:52:29 -0400
committerunknown <mikael/pappa@dator5.(none)>2006-10-02 15:52:29 -0400
commit93f4daf1b45f425057138b575caed00d489d002b (patch)
tree4bca4ca32b026e15672d4d0284b012a03a358a81 /sql/ha_partition.cc
parentd8e3aebedec0281c8d8fe14820b7c06663b35ed1 (diff)
downloadmariadb-git-93f4daf1b45f425057138b575caed00d489d002b.tar.gz
BUG#18198: Partition function handling
Fixes of after review fixes mysql-test/r/partition_hash.result: Fixed test cases mysql-test/r/partition_range.result: Fixed test cases mysql-test/t/partition_range.test: Fixed test cases sql/ha_ndbcluster.cc: Fixed error printout to avoid complex character set code in print_error sql/ha_partition.cc: Fixed error printout to avoid complex character set code in print_error sql/partition_info.cc: Fixed error printout to avoid complex character set code in print_error sql/partition_info.h: Fixed error printout to avoid complex character set code in print_error sql/sql_partition.cc: indendentation fix
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 3cb855b1035..1e75dd08f38 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -2670,7 +2670,10 @@ int ha_partition::write_row(byte * buf)
#endif
dbug_tmp_restore_column_map(table->read_set, old_map);
if (unlikely(error))
+ {
+ m_part_info->err_value= func_value;
DBUG_RETURN(error);
+ }
m_last_part= part_id;
DBUG_PRINT("info", ("Insert in partition %d", part_id));
DBUG_RETURN(m_file[part_id]->write_row(buf));
@@ -2719,6 +2722,7 @@ int ha_partition::update_row(const byte *old_data, byte *new_data)
m_part_info, &old_part_id, &new_part_id,
&func_value)))
{
+ m_part_info->err_value= func_value;
DBUG_RETURN(error);
}