bk commit into 5.0 tree (kostja:1.2241)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-28 02:03:20+04:00, kostja@stripped +2 -0
  sql_select.cc:
    adf.

  sql/sql_select.cc@stripped, 2006-07-28 02:01:39+04:00, kostja@stripped +1 -0
    adf.

  sql/sql_yacc.yy@stripped, 2006-07-28 02:02:58+04:00, kostja@stripped +11 -2

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kostja
# Host:	bodhi.local
# Root:	/opt/local/work/mysql-5.0-runtime-experiment

--- 1.429/sql/sql_select.cc	2006-07-28 02:03:28 +04:00
+++ 1.430/sql/sql_select.cc	2006-07-28 02:03:28 +04:00
@@ -15,6 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 
+
 /* mysql_select and join optimization */
 
 #ifdef USE_PRAGMA_IMPLEMENTATION

--- 1.475/sql/sql_yacc.yy	2006-07-28 02:03:28 +04:00
+++ 1.476/sql/sql_yacc.yy	2006-07-28 02:03:28 +04:00
@@ -4272,6 +4272,15 @@ all_or_any: ALL     { $$ = 1; }
 interval_expr:
          INTERVAL_SYM expr { $$=$2; }
         ;
+not_in_view:
+        {
+          if (lex->sql_command == SQLCOM_CREATE_VIEW)
+          {
+            my_error();
+            YYABORT;
+          }
+        }
+        ;
 
 simple_expr:
 	simple_ident
@@ -4291,14 +4300,14 @@ simple_expr:
 	    lex->uncacheable(UNCACHEABLE_RAND);
 	    lex->variables_used= 1;
 	  }
-	| '@' ident_or_text
+	| '@' ident_or_text not_in_view
 	  {
 	    $$= new Item_func_get_user_var($2);
 	    LEX *lex= Lex;
 	    lex->uncacheable(UNCACHEABLE_RAND);
 	    lex->variables_used= 1;
 	  }
-	| '@' '@' opt_var_ident_type ident_or_text opt_component
+	| '@' '@' opt_var_ident_type ident_or_text not_in_view opt_component
 	  {
 
             if ($4.str && $5.str && check_reserved_words(&$4))