merge from 5.5.16

2026-05-02 21:25:36 +02:00 · 2011-09-21 12:40:41 +02:00 · 2011-09-21 12:40:41 +02:00 · 7450044eb7
commit 7450044eb7
parent d27d267ee7 8433c8ce61
74 changed files with 715 additions and 373 deletions
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@ -8644,6 +8644,11 @@ function_call_generic:
            Create_func *builder;
            Item *item= NULL;

+            if (check_routine_name(&$1))
+            {
+              MYSQL_YYABORT;
+            }
+
            /*
              Implementation note:
              names are resolved with the following order:
@ -8707,6 +8712,16 @@ function_call_generic:
              version() (a vendor can specify any schema).
            */

+            if (!$1.str || check_db_name(&$1))
+            {
+              my_error(ER_WRONG_DB_NAME, MYF(0), $1.str);
+              MYSQL_YYABORT;
+            }
+            if (check_routine_name(&$3))
+            {
+              MYSQL_YYABORT;
+            }
+
            builder= find_qualified_function_builder(thd);
            DBUG_ASSERT(builder);
            item= builder->create(thd, $1, $3, true, $5);