diff options
author | unknown <pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-09-14 18:16:36 -0400 |
---|---|---|
committer | unknown <pappa@c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2005-09-14 18:16:36 -0400 |
commit | 4e0c218194677207c954a9d0a24213a7fdbfa8d0 (patch) | |
tree | faf5ec48f3c3dcdbafb8b29f5ea2adb3ffb19b25 /sql/sql_partition.cc | |
parent | 24f047831f9bdcbef5762a3be1f6d506422e0642 (diff) | |
parent | dc4e76ca78716e2b0c74c3896e189435ee829ecd (diff) | |
download | mariadb-git-4e0c218194677207c954a9d0a24213a7fdbfa8d0.tar.gz |
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into c-0d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
sql/sql_partition.cc:
Auto merged
Diffstat (limited to 'sql/sql_partition.cc')
-rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index b2efada1a49..5910e43a112 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -2305,7 +2305,7 @@ static uint32 get_part_id_key(Field **field_array, uint no_parts) { DBUG_ENTER("get_part_id_key"); - DBUG_RETURN(calculate_key_value(field_array) & no_parts); + DBUG_RETURN(calculate_key_value(field_array) % no_parts); } |