mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  linux.site:/home/reggie/work/mysql-5.1-bug15968


sql/sql_partition.cc:
  Auto merged
This commit is contained in:
unknown 2006-01-16 15:23:29 -06:00
commit 20d0d10ea2
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/partition_hash.result
View file

@ -64,3 +64,9 @@ primary key(a,b))
partition by key (a)
(partition x1);
drop table t1;
CREATE TABLE t1 (f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM' PARTITION BY HASH(f1) PARTITIONS 2;
INSERT INTO t1 SET f1 = 0 - 1, f2 = '#######';
select * from t1;
f1 f2
-1 #######
drop table t1;

9
mysql-test/t/partition_hash.test
View file

@ -75,3 +75,12 @@ partition by key (a)
(partition x1);
drop table t1;
#
# Bug# 15968 - crash when INSERT with f1 = -1 into partition by hash(f1)
#
CREATE TABLE t1 (f1 INTEGER, f2 char(20)) ENGINE = 'MYISAM' PARTITION BY HASH(f1) PARTITIONS 2;
INSERT INTO t1 SET f1 = 0 - 1, f2 = '#######';
select * from t1;
drop table t1;

3
sql/sql_partition.cc
View file

@ -2332,7 +2332,8 @@ static uint32 get_part_id_hash(uint no_parts,
Item *part_expr)
{
DBUG_ENTER("get_part_id_hash");
DBUG_RETURN((uint32)(part_expr->val_int() % no_parts));
longlong int_hash_id= part_expr->val_int() % no_parts;
DBUG_RETURN(int_hash_id < 0 ? -int_hash_id : int_hash_id);
}