Commit 18ed9144 authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/B21392-5.0-opt


mysql-test/t/delete.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/delete.result:
  merge 4.1->5.0
sql/sql_parse.cc:
  merge 4.1->5.0
parents efa8e330 1431966d

mysql-test/r/delete.result

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ a 
0

2

DROP TABLE t1;

create table t1 (a int);

delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5;

delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5;

drop table t1;

CREATE TABLE t1 (a int not null,b int not null);

CREATE TABLE t2 (a int not null, b int not null, primary key (a,b));

CREATE TABLE t3 (a int not null, b int not null, primary key (a,b));

mysql-test/t/delete.test

+10 −0
Original line number Diff line number Diff line
@@ -153,6 +153,16 @@ DELETE FROM t1 WHERE t1.a > 0 ORDER BY t1.a LIMIT 1; 
SELECT * FROM t1;

DROP TABLE t1;



#

# Bug #21392: multi-table delete with alias table name fails with 

# 1003: Incorrect table name

#



create table t1 (a int);

delete `4.t1` from t1 as `4.t1` where `4.t1`.a = 5;

delete FROM `4.t1` USING t1 as `4.t1` where `4.t1`.a = 5;

drop table t1;



# End of 4.1 tests



#

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ void view_store_options(THD *thd, st_table_list *table, String *buff); 
#define TL_OPTION_UPDATING	1

#define TL_OPTION_FORCE_INDEX	2

#define TL_OPTION_IGNORE_LEAVES 4

#define TL_OPTION_ALIAS         8



/* Some portable defines */

sql/sql_parse.cc

+3 −1
Original line number Diff line number Diff line
@@ -6085,6 +6085,7 @@ bool add_to_list(THD *thd, SQL_LIST &list,Item *item,bool asc) 
    table_options	A set of the following bits:

			TL_OPTION_UPDATING	Table will be updated

			TL_OPTION_FORCE_INDEX	Force usage of index

			TL_OPTION_ALIAS	        an alias in multi table DELETE

    lock_type		How table should be locked

    use_index		List of indexed used in USE INDEX

    ignore_index	List of indexed used in IGNORE INDEX
@@ -6113,7 +6114,8 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd, 
  if (!table)

    DBUG_RETURN(0);				// End of memory

  alias_str= alias ? alias->str : table->table.str;

  if (check_table_name(table->table.str, table->table.length))

  if (!test(table_options & TL_OPTION_ALIAS) && 

      check_table_name(table->table.str, table->table.length))

  {

    my_error(ER_WRONG_TABLE_NAME, MYF(0), table->table.str);

    DBUG_RETURN(0);

sql/sql_yacc.yy

+5 −2
Original line number Diff line number Diff line
@@ -6319,14 +6319,17 @@ table_wild_one: 
	ident opt_wild opt_table_alias

	{

	  if (!Select->add_table_to_list(YYTHD, new Table_ident($1), $3,

					 TL_OPTION_UPDATING, Lex->lock_option))

					 TL_OPTION_UPDATING | 

                                         TL_OPTION_ALIAS, Lex->lock_option))

	    YYABORT;

        }

	| ident '.' ident opt_wild opt_table_alias

	  {

	    if (!Select->add_table_to_list(YYTHD,

					   new Table_ident(YYTHD, $1, $3, 0),

					   $5, TL_OPTION_UPDATING,

					   $5, 

                                           TL_OPTION_UPDATING | 

                                           TL_OPTION_ALIAS,

					   Lex->lock_option))

	      YYABORT;

	  }