diff options
author | unknown <msvensson@neptunus.(none)> | 2006-03-24 13:56:05 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-03-24 13:56:05 +0100 |
commit | f444a685d61dc15cfa0782c7eb9db96a711a7285 (patch) | |
tree | acf85293295caf55a504bfb5fdb5afff4c1c3b6d | |
parent | 6bab9b30529a3916469210cf3e09279f66197dca (diff) | |
parent | ed3e8700bd595aa3ca10ae7e09ce0cb8f63b6181 (diff) | |
download | mariadb-git-f444a685d61dc15cfa0782c7eb9db96a711a7285.tar.gz |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-rw-r--r-- | sql/udf_example.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/udf_example.cc b/sql/udf_example.cc index e6d272d9085..73e49aef178 100644 --- a/sql/udf_example.cc +++ b/sql/udf_example.cc @@ -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; } |