database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion (SCRUM)

Browse Source 
fixed some possible bugs


sql/item.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_subselect.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/item_sum.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/mysql_priv.h:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_base.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_cache.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_delete.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_lex.h:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
  fixed some possible bugs
sql/sql_parse.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_prepare.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_repl.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_select.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_union.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_update.cc:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
sql/sql_yacc.yy:
  removed SELECT_LEX_UNIT -> SELECT_LEX pointer conversion
This commit is contained in:
unknown
2002-10-30 13:18:52 +02:00
parent fc4c9c01ee
commit 0bb1e716bc
16 changed files with 569 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_delete.cc
View File

@@ -52,7 +52,8 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
thd->proc_info="init";
table->map=1;
if (setup_conds(thd,table_list,&conds) || setup_ftfuncs(thd))
if (setup_conds(thd,table_list,&conds) ||
setup_ftfuncs(&thd->lex.select_lex))
DBUG_RETURN(-1);
/* Test if the user wants to delete all rows */
@@ -129,7 +130,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order,
init_read_record(&info,thd,table,select,1,1);
deleted=0L;
init_ftfuncs(thd,1);
init_ftfuncs(thd, &thd->lex.select_lex, 1);
thd->proc_info="updating";
while (!(error=info.read_record(&info)) && !thd->killed)
{
@@ -284,7 +285,11 @@ multi_delete::initialize_tables(JOIN *join)
table->file->ref_length,
MEM_STRIP_BUF_SIZE);
}
init_ftfuncs(thd,1);
/*
There are (SELECT_LEX*) pointer conversion here global union parameters
can't be used in multidelete
*/
init_ftfuncs(thd, (SELECT_LEX*)thd->lex.current_select, 1);
}