diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 15:43:16 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-16 15:43:16 -0600 |
| commit | 1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec (patch) | |
| tree | cd392457a794060b12c7e5bcea34b7bffb75708d /sql/sql_udf.cc | |
| parent | 3c6d858b6c1ee7b2f475e184b28a1af04ae256e3 (diff) | |
| parent | 42b6424327763192c7fb4701f0ae93b7a52af89d (diff) | |
| download | mariadb-git-1dc0efc606bf7f66402e7f9728b7e4a0a1fd82ec.tar.gz | |
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
mysql-test/r/sp-error.result:
failed auto merge
mysql-test/r/sp.result:
failed auto merge
mysql-test/r/udf.result:
failed auto merge
mysql-test/t/sp.test:
failed auto merge
sql/sp_head.cc:
failed auto merge
sql/sql_yacc.yy:
failed auto merge
Diffstat (limited to 'sql/sql_udf.cc')
| -rw-r--r-- | sql/sql_udf.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 19582af38f4..1076772d598 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -415,7 +415,7 @@ int mysql_create_function(THD *thd,udf_func *udf) if (check_string_char_length(&udf->name, "", NAME_CHAR_LEN, system_charset_info, 1)) { - my_error(ER_TOO_LONG_IDENT, MYF(0), udf->name); + my_error(ER_TOO_LONG_IDENT, MYF(0), udf->name.str); DBUG_RETURN(1); } @@ -429,7 +429,7 @@ int mysql_create_function(THD *thd,udf_func *udf) rw_wrlock(&THR_LOCK_udf); if ((hash_search(&udf_hash,(uchar*) udf->name.str, udf->name.length))) { - my_error(ER_UDF_EXISTS, MYF(0), udf->name); + my_error(ER_UDF_EXISTS, MYF(0), udf->name.str); goto err; } if (!(dl = find_udf_dl(udf->dl))) |