diff options
| author | unknown <serg@serg.mylan> | 2005-05-19 09:47:13 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-05-19 09:47:13 +0200 |
| commit | 275aa247405e3fbd364598132858b27e9e47cc7d (patch) | |
| tree | 9973bf63fdadac65b367ac222982907ed3e2fc8b | |
| parent | 7e507270b88ee5407ee0e30e17e06106aa01473e (diff) | |
| download | mariadb-git-275aa247405e3fbd364598132858b27e9e47cc7d.tar.gz | |
after merge fix
| -rw-r--r-- | mysql-test/r/select.result | 2 | ||||
| -rw-r--r-- | sql/sql_udf.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index 38ebd26abe4..c39d1a322e4 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2454,7 +2454,7 @@ select all distinct * from t1; ERROR HY000: Incorrect usage of ALL and DISTINCT select distinct all * from t1; ERROR HY000: Incorrect usage of ALL and DISTINCT -DROP TABLE t1; +drop table t1; CREATE TABLE t1 ( kunde_intern_id int(10) unsigned NOT NULL default '0', kunde_id int(10) unsigned NOT NULL default '0', diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc index 7157111b25c..31205c0a614 100644 --- a/sql/sql_udf.cc +++ b/sql/sql_udf.cc @@ -195,7 +195,7 @@ void udf_init() */ if (strchr(dl_name, '/') || IF_WIN(strchr(dl_name, '\\'),0) || - strlen(name) > NAME_LEN) + strlen(name.str) > NAME_LEN) { sql_print_error("Invalid row in mysql.func table for function '%.64s'", name.str); |