Commit 15df552e authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixes after merge. Now it compiles and passes the test suite

parent 7c9b9f47

Docs/manual.texi

+1 −1
Original line number Diff line number Diff line
@@ -22870,7 +22870,7 @@ You can set the default isolation level for @code{mysqld} with 














@findex GRANT















@findex REVOKE













@node GRANT, CREATE INDEX, SET TRANSACTION, Reference













@node GRANT, HANDLER, SET TRANSACTION, Reference















@section @code{GRANT} and @code{REVOKE} Syntax





























@example

























sql/sql_delete.cc



+3
−1






























Original line number
Diff line number
Diff line








@@ -205,6 +205,7 @@ int mysql_delete(THD *thd,













    TABLE_LIST   tables;















    List<Item>   fields;















    List<Item>   all_fields;













    ha_rows examined_rows;































    bzero((char*) &tables,sizeof(tables));















    tables.table = table;









@@ -214,7 +215,8 @@ int mysql_delete(THD *thd,













    if (setup_order(thd, &tables, fields, all_fields, order) ||















        !(sortorder=make_unireg_sortorder(order, &length)) ||















        (table->found_records = filesort(&table, sortorder, length,













                                        (SQL_SELECT *) 0, 0L, HA_POS_ERROR))













                                        (SQL_SELECT *) 0, 0L, HA_POS_ERROR,













					 &examined_rows))















        == HA_POS_ERROR)















    {















      delete select;

































sql/sql_select.cc



+1
−1






























Original line number
Diff line number
Diff line








@@ -800,6 +800,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,





























err:















  thd->limit_found_rows = join.send_records;













  thd->examined_row_count = join.examined_rows;















  thd->proc_info="end";















  join.lock=0;					// It's faster to unlock later















  join_free(&join);










@@ -2546,7 +2547,6 @@ join_free(JOIN *join)













      delete tab->select;















      delete tab->quick;















      x_free(tab->cache.buff);













      end_read_record(&tab->read_record);















      if (tab->table)















      {















	if (tab->table->key_read)

































sql/sql_update.cc



+3
−1






























Original line number
Diff line number
Diff line








@@ -175,6 +175,7 @@ int mysql_update(THD *thd,













      TABLE_LIST   tables;















      List<Item>   fields;















      List<Item>   all_fields;













      ha_rows examined_rows;































      bzero((char*) &tables,sizeof(tables));















      tables.table = table;









@@ -184,7 +185,8 @@ int mysql_update(THD *thd,













      if (setup_order(thd, &tables, fields, all_fields, order) ||















          !(sortorder=make_unireg_sortorder(order, &length)) ||















          (table->found_records = filesort(&table, sortorder, length,













                                           (SQL_SELECT *) 0, 0L, HA_POS_ERROR))













                                           (SQL_SELECT *) 0, 0L,













					   HA_POS_ERROR, &examined_rows))















          == HA_POS_ERROR)















      {















	delete select;

































sql/sql_yacc.yy



+7
−0






























Original line number
Diff line number
Diff line








@@ -72,6 +72,13 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);





























%token	END_OF_INPUT





























%token CLOSE_SYM













%token HANDLER_SYM













%token LAST_SYM













%token NEXT_SYM













%token PREV_SYM













%token SQL_CALC_FOUND_ROWS





























%token	EQ















%token	EQUAL_SYM















%token	GE