bk commit into 5.1 tree (gbichot:1.2161)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of gbichot. When gbichot 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
  1.2161 06/05/18 10:08:43 gbichot@stripped +1 -0
  Merge gbichot@bk-internal:/home/bk/mysql-5.1-new
  into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new

  sql/sql_yacc.yy
    1.477 06/05/18 10:08:29 gbichot@stripped +0 -0
    Auto merged

# 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:	gbichot
# Host:	dl145j.mysql.com
# Root:	/users/gbichot/mysql-5.1-new/RESYNC

--- 1.476/sql/sql_yacc.yy	2006-05-12 22:13:39 +02:00
+++ 1.477/sql/sql_yacc.yy	2006-05-18 10:08:29 +02:00
@@ -475,6 +475,7 @@
 %token  NUMERIC_SYM
 %token  NVARCHAR_SYM
 %token  OFFSET_SYM
+%token  OJ_SYM
 %token  OLD_PASSWORD
 %token  ON
 %token  ONE_SHOT_SYM
@@ -6943,11 +6944,14 @@
           }
           expr '}'
 	  {
+	    LEX *lex= Lex;
             YYERROR_UNLESS($3 && $7);
             add_join_on($7,$10);
             Lex->pop_context();
             $7->outer_join|=JOIN_TYPE_LEFT;
             $$=$7;
+            if (!($$= lex->current_select->nest_last_join(lex->thd)))
+              YYABORT;
           }
 	| select_derived_init get_select_lex select_derived2
           {