Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into serg.mylan:/usr/home/serg/Abk/mysql-5.1

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
f02227cb · serg@serg.mylan · f7443127 · 995bb87d · f02227cb
Commit f02227cb authored Jun 03, 2006 by serg@serg.mylan
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

sql/sql_partition.cc sql/sql_partition.cc +10 -6

No files found.
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -2199,9 +2199,11 @@ static uint32 get_part_id_linear_key(partition_info *part_info,
    out:part_id         The partition id is returned through this pointer
  RETURN VALUE
-    part_id
+    part_id                     Partition id of partition that would contain
-    return TRUE means that the fields of the partition function didn't fit
+                                row with given values of PF-fields
-    into any partition and thus the values of the PF-fields are not allowed.
+    HA_ERR_NO_PARTITION_FOUND   The fields of the partition function didn't
+                                fit into any partition and thus the values of 
+                                the PF-fields are not allowed.
  DESCRIPTION
    A routine used from write_row, update_row and delete_row from any
@@ -2240,9 +2242,11 @@ static uint32 get_part_id_linear_key(partition_info *part_info,
    out:part_id         The partition id is returned through this pointer
  RETURN VALUE
-    part_id
+    part_id                     Partition id of partition that would contain
-    return TRUE means that the fields of the partition function didn't fit
+                                row with given values of PF-fields
-    into any partition and thus the values of the PF-fields are not allowed.
+    HA_ERR_NO_PARTITION_FOUND   The fields of the partition function didn't
+                                fit into any partition and thus the values of 
+                                the PF-fields are not allowed.
  DESCRIPTION