Commit 8f04aaae authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-valgrind-4.1
parents 5847d107 f9bcb9ab

sql/sql_yacc.yy

+5 −1
Original line number Diff line number Diff line
@@ -4009,6 +4009,7 @@ insert: 
	  LEX *lex= Lex;

	  lex->sql_command= SQLCOM_INSERT;

	  lex->duplicates= DUP_ERROR;

          mysql_init_select(lex);

	  /* for subselects */

          lex->lock_option= (using_update_log) ? TL_READ_NO_INSERT : TL_READ;

	  lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;
@@ -4028,6 +4029,7 @@ replace: 
	  LEX *lex=Lex;

	  lex->sql_command = SQLCOM_REPLACE;

	  lex->duplicates= DUP_REPLACE;

          mysql_init_select(lex);

	  lex->select_lex.resolve_mode= SELECT_LEX::INSERT_MODE;

	}

	replace_lock_option insert2
@@ -4229,6 +4231,7 @@ delete: 
	{

	  LEX *lex= Lex;

	  lex->sql_command= SQLCOM_DELETE;

          mysql_init_select(lex);

	  lex->lock_option= lex->thd->update_lock_default;

	  lex->ignore= 0;

	  lex->select_lex.init_order();
@@ -5321,6 +5324,7 @@ set: 
	{

	  LEX *lex=Lex;

	  lex->sql_command= SQLCOM_SET_OPTION;

          mysql_init_select(lex);

	  lex->option_type=OPT_SESSION;

	  lex->var_list.empty();

          lex->one_shot_set= 0;