merge 5.1-security->5.5-security

1 files changed, 15 insertions, 0 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index a974998f207..6a1671b3653 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -8639,6 +8639,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:
@@ -8702,6 +8707,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);