Merge sinisa@work.mysql.com:/home/bk/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0


sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

1 files changed, 7 insertions, 7 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9ec9a526583..a6707620243 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -2452,13 +2452,13 @@ mysql_new_select(LEX *lex)
   uint select_no=lex->select->select_number;
   SELECT_LEX *select_lex = (SELECT_LEX *) lex->thd->calloc(sizeof(SELECT_LEX));
   lex->select->next=select_lex; 
-  lex->select=select_lex; lex->select->select_number = ++select_no;
-  lex->select->item_list = lex->select_lex.item_list; 
-  lex->select->item_list.empty();
-  lex->select->table_list = lex->select_lex.table_list; 
-  lex->select->table_list.elements=0;
-  lex->select->table_list.first=0;
-  lex->select->table_list.next= (byte**) &lex->select->table_list.first;
+  lex->select=select_lex; select_lex->select_number = ++select_no;
+  select_lex->table_list.elements=0;
+  select_lex->table_list.first=0;
+  select_lex->table_list.next= (byte**) &select_lex->table_list.first;
+  select_lex->item_list.empty(); select_lex->when_list.empty(); 
+  select_lex->expr_list.empty();  select_lex->interval_list.empty(); 
+  select_lex->use_index.empty(); select_lex->ftfunc_list.empty();
 }
 
 void