diff options
| author | unknown <patg@radha.patg.net> | 2006-12-22 08:57:32 -0500 |
|---|---|---|
| committer | unknown <patg@radha.patg.net> | 2006-12-22 08:57:32 -0500 |
| commit | 8a1ff42fe0fa5514ba6d28408215a54bc4ed5e9d (patch) | |
| tree | 9ae09ecf78b4d6982791b9fd82361130b93404ec /sql/udf_example.c | |
| parent | 8f3e39bd4985cd6cde244c6a2eb27950ade33585 (diff) | |
| parent | b95a067685ed8f902e0f92f89c16a374c9214980 (diff) | |
| download | mariadb-git-8a1ff42fe0fa5514ba6d28408215a54bc4ed5e9d.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
mysql-test/t/disabled.def:
Auto merged
sql/mysqld.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/udf_example.c')
| -rw-r--r-- | sql/udf_example.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/udf_example.c b/sql/udf_example.c index bbab47e253d..f938cc9c1d3 100644 --- a/sql/udf_example.c +++ b/sql/udf_example.c @@ -1087,7 +1087,7 @@ my_bool is_const_init(UDF_INIT *initid, UDF_ARGS *args, char *message) strmov(message, "IS_CONST accepts only one argument"); return 1; } - initid->ptr= (char*)((args->args[0] != NULL) ? 1 : 0); + initid->ptr= (char*)((args->args[0] != NULL) ? 1UL : 0); return 0; } |