1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Docs/manual.texi:
  fixed bug from merge
sql/sql_delete.cc:
  examined rows fix
sql/sql_select.cc:
  fix bugs from merge
sql/sql_update.cc:
  examined rows merge completion
sql/sql_yacc.yy:
  fixed bugs from merge
This commit is contained in:
unknown 2001-05-10 17:08:29 -06:00
parent 9192600eb7
commit 174fdf05a1
5 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/manual.texi
View File

@ -22870,7 +22870,7 @@ You can set the default isolation level for @code{mysqld} with
@findex GRANT @findex GRANT
@findex REVOKE @findex REVOKE
@node GRANT, CREATE INDEX, SET TRANSACTION, Reference @node GRANT, HANDLER, SET TRANSACTION, Reference
@section @code{GRANT} and @code{REVOKE} Syntax @section @code{GRANT} and @code{REVOKE} Syntax
@example @example

4
sql/sql_delete.cc
View File

@ -205,6 +205,7 @@ int mysql_delete(THD *thd,
TABLE_LIST tables; TABLE_LIST tables;
List<Item> fields; List<Item> fields;
List<Item> all_fields; List<Item> all_fields;
ha_rows examined_rows;
bzero((char*) &tables,sizeof(tables)); bzero((char*) &tables,sizeof(tables));
tables.table = table; tables.table = table;
@ -214,7 +215,8 @@ int mysql_delete(THD *thd,
if (setup_order(thd, &tables, fields, all_fields, order) || if (setup_order(thd, &tables, fields, all_fields, order) ||
!(sortorder=make_unireg_sortorder(order, &length)) || !(sortorder=make_unireg_sortorder(order, &length)) ||
(table->found_records = filesort(&table, sortorder, 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) == HA_POS_ERROR)
{ {
delete select; delete select;

2
sql/sql_select.cc
View File

@ -800,6 +800,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
err: err:
thd->limit_found_rows = join.send_records; thd->limit_found_rows = join.send_records;
thd->examined_row_count = join.examined_rows;
thd->proc_info="end"; thd->proc_info="end";
join.lock=0; // It's faster to unlock later join.lock=0; // It's faster to unlock later
join_free(&join); join_free(&join);
@ -2546,7 +2547,6 @@ join_free(JOIN *join)
delete tab->select; delete tab->select;
delete tab->quick; delete tab->quick;
x_free(tab->cache.buff); x_free(tab->cache.buff);
end_read_record(&tab->read_record);
if (tab->table) if (tab->table)
{ {
if (tab->table->key_read) if (tab->table->key_read)

4
sql/sql_update.cc
View File

@ -175,6 +175,7 @@ int mysql_update(THD *thd,
TABLE_LIST tables; TABLE_LIST tables;
List<Item> fields; List<Item> fields;
List<Item> all_fields; List<Item> all_fields;
ha_rows examined_rows;
bzero((char*) &tables,sizeof(tables)); bzero((char*) &tables,sizeof(tables));
tables.table = table; tables.table = table;
@ -184,7 +185,8 @@ int mysql_update(THD *thd,
if (setup_order(thd, &tables, fields, all_fields, order) || if (setup_order(thd, &tables, fields, all_fields, order) ||
!(sortorder=make_unireg_sortorder(order, &length)) || !(sortorder=make_unireg_sortorder(order, &length)) ||
(table->found_records = filesort(&table, sortorder, 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) == HA_POS_ERROR)
{ {
delete select; delete select;

7
sql/sql_yacc.yy
View File

@ -72,6 +72,13 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
%token END_OF_INPUT %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 EQ
%token EQUAL_SYM %token EQUAL_SYM
%token GE %token GE