diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
| commit | 4e09f14b18ededb18aab527abe582fca34afe79c (patch) | |
| tree | 7a953ea10b82122bdf37cf7efc4cfd3fd9a20b17 /sql/sql_udf.cc | |
| parent | 48869febe61d1aef3e05af6bd17bab3e27b90f6d (diff) | |
| parent | 07001f78eca148d143ebf7fea66f4296a19a6d51 (diff) | |
| download | mariadb-git-4e09f14b18ededb18aab527abe582fca34afe79c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 99410bb34ac..c237b023e7b 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -345,7 +345,7 @@ static udf_func *add_udf(LEX_STRING *name, Item_result ret, char *dl, tmp->returns = ret; tmp->type = type; tmp->usage_count=1; - if (hash_insert(&udf_hash,(byte*) tmp)) + if (my_hash_insert(&udf_hash,(byte*) tmp)) return 0; using_udf_functions=1; return tmp; |