diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-11-15 12:27:09 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-11-15 12:27:09 -0500 |
| commit | ab6d44374e792b11f15e39b91fce0c725905f226 (patch) | |
| tree | 9a79012704dbf5c7f4d7086a35e6d2d39fadc57b /sql/item_func.cc | |
| parent | 5b3cfaa8d7d770e91fcb1339405aeb16ffcac8b8 (diff) | |
| parent | 3be6493aab368e43165cd523963cf513f1588ac5 (diff) | |
| download | mariadb-git-ab6d44374e792b11f15e39b91fce0c725905f226.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug19955/my50-bug19955
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index a7c9a836fde..6e81b03d846 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1326,6 +1326,10 @@ longlong Item_func_mod::int_op() signal_divide_by_null(); return 0; } + + if (args[0]->unsigned_flag) + return ((ulonglong) value) % val2; + return value % val2; } |