Commit 541ff258 authored by serg@serg.mylan's avatar serg@serg.mylan

after merge fix

parent 8044488d
...@@ -2454,7 +2454,7 @@ select all distinct * from t1; ...@@ -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',
......
...@@ -195,7 +195,7 @@ void udf_init() ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment