List:Commits« Previous MessageNext Message »
From:Elliot Murphy Date:April 22 2006 3:45am
Subject:bk commit into 5.1 tree (elliot:1.2352)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of emurphy. When emurphy 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.2352 06/04/21 23:45:22 elliot@stripped +1 -0
  Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge
  into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge

  sql/sql_yacc.yy
    1.469 06/04/21 23:45:17 elliot@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:	elliot
# Host:	xan.(none)
# Root:	/home/emurphy/src/mysql/bk-clean/mysql-5.1-merge/RESYNC

--- 1.468/sql/sql_yacc.yy	2006-04-19 21:05:38 -04:00
+++ 1.469/sql/sql_yacc.yy	2006-04-21 23:45:17 -04:00
@@ -4740,7 +4740,7 @@
 	    lex->sql_command= SQLCOM_CREATE_VIEW;
 	    lex->create_view_mode= VIEW_ALTER;
 	    /* first table in list is target VIEW name */
-	    lex->select_lex.add_table_to_list(thd, $6, NULL, 0);
+	    lex->select_lex.add_table_to_list(thd, $6, NULL, TL_OPTION_UPDATING);
 	  }
 	  view_list_opt AS view_select view_check_option
 	  {}
@@ -10843,7 +10843,7 @@
 	  LEX *lex= thd->lex;
 	  lex->sql_command= SQLCOM_CREATE_VIEW;
 	  /* first table in list is target VIEW name */
-	  if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0))
+	  if (!lex->select_lex.add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING))
 	    YYABORT;
 	}
 	view_list_opt AS view_select view_check_option
Thread
bk commit into 5.1 tree (elliot:1.2352)Elliot Murphy22 Apr