diff options
| author | unknown <msvensson@pilot.(none)> | 2007-08-09 10:37:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.(none)> | 2007-08-09 10:37:50 +0200 |
| commit | e0288a6ae15264a7f73905059112be8a92db5c77 (patch) | |
| tree | dd9ca977e9597d658de51fb0f6b4fc7de18a78f3 | |
| parent | 3250963e7b2f5145bf837d03a1d9ac6cd3cb51c9 (diff) | |
| parent | 0f54801412886753b480d6d27bf75f3e8c6fdee7 (diff) | |
| download | mariadb-git-e0288a6ae15264a7f73905059112be8a92db5c77.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.(none):/data/msvensson/mysql/my51-bug29804
| -rw-r--r-- | sql/udf_example.c | 6 | ||||
| -rw-r--r-- | sql/udf_example.def | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/udf_example.c b/sql/udf_example.c index 5165a577555..6c07a929b04 100644 --- a/sql/udf_example.c +++ b/sql/udf_example.c @@ -1115,15 +1115,15 @@ my_bool check_const_len_init(UDF_INIT *initid, UDF_ARGS *args, char *message) } if (args->args[0] == 0) { - initid->ptr= "Not constant"; + initid->ptr= (char*)"Not constant"; } else if(strlen(args->args[0]) == args->lengths[0]) { - initid->ptr= "Correct length"; + initid->ptr= (char*)"Correct length"; } else { - initid->ptr= "Wrong length"; + initid->ptr= (char*)"Wrong length"; } initid->max_length = 100; return 0; diff --git a/sql/udf_example.def b/sql/udf_example.def index 7a87147d7b6..7c69b681f8b 100644 --- a/sql/udf_example.def +++ b/sql/udf_example.def @@ -23,3 +23,4 @@ EXPORTS avgcost is_const is_const_init + check_const_len |