1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

after merge fix

Browse Source
This commit is contained in:
unknown 2005-05-19 09:47:13 +02:00
parent 7e507270b8
commit 275aa24740
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/select.result
View File

@ -2454,7 +2454,7 @@ select all distinct * from t1;
ERROR HY000: Incorrect usage of ALL and DISTINCT ERROR HY000: Incorrect usage of ALL and DISTINCT
select distinct all * from t1; select distinct all * from t1;
ERROR HY000: Incorrect usage of ALL and DISTINCT ERROR HY000: Incorrect usage of ALL and DISTINCT
DROP TABLE t1; drop table t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
kunde_intern_id int(10) unsigned NOT NULL default '0', kunde_intern_id int(10) unsigned NOT NULL default '0',
kunde_id int(10) unsigned NOT NULL default '0', kunde_id int(10) unsigned NOT NULL default '0',

2
sql/sql_udf.cc
View File

@ -195,7 +195,7 @@ void udf_init()
*/ */
if (strchr(dl_name, '/') || if (strchr(dl_name, '/') ||
IF_WIN(strchr(dl_name, '\\'),0) || 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'", sql_print_error("Invalid row in mysql.func table for function '%.64s'",
name.str); name.str);