Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.rpc
This commit is contained in:
unknown 2003-03-28 00:07:13 +04:00
commit 8e12f0e0d8

View file

@ -813,8 +813,8 @@ void Item_func_replace::fix_length_and_dec()
int diff=(int) (args[2]->max_length - args[1]->max_length); int diff=(int) (args[2]->max_length - args[1]->max_length);
if (diff > 0 && args[1]->max_length) if (diff > 0 && args[1]->max_length)
{ // Calculate of maxreplaces { // Calculate of maxreplaces
max_length= max_length/args[1]->max_length; int max_substrs= max_length/args[1]->max_length;
max_length= (max_length+1)*(uint) diff; max_length+= max_substrs*(uint) diff;
} }
if (max_length > MAX_BLOB_WIDTH) if (max_length > MAX_BLOB_WIDTH)
{ {