Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mashka.mysql.fi:/home/my/mysql-tmp


sql/sql_parse.cc:
  Auto merged

sql/sql_parse.cc

@@ -176,6 +176,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
 
 }
 
+#ifndef EMBEDDED_LIBRARY
 
 /*
     Check if user exist and password supplied is correct. 
@@ -351,6 +352,9 @@ static int check_user(THD *thd, enum enum_server_command command,
   DBUG_RETURN(-1);
 }
 
+#endif // EMBEDDED_LIBRARY
+
+
 /*
   Check for maximum allowable user connections, if the mysqld server is
   started with corresponding variable that is greater then 0.