Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
This commit is contained in:
commit
11d1a6fc41
@ -497,7 +497,7 @@ char *metaphon(UDF_INIT *initid, UDF_ARGS *args, char *result,
|
||||
}
|
||||
}
|
||||
}
|
||||
*length= (ulong) (result - org_result);
|
||||
*length= (ulong) (max(0, result - org_result - 1));
|
||||
return org_result;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user