From 53a386ca874d69d471eaf1600c2f55e063e03c5a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 4 Nov 2002 22:12:45 +0200 Subject: moved similar code to function onversion with check sql/item.cc: removed similar code sql/item_sum.cc: conversion with check sql/sql_delete.cc: conversion with check sql/sql_derived.cc: style fix sql/sql_lex.cc: conversion with check moved similar code to function sql/sql_lex.h: conversion with check moved similar code to function sql/sql_parse.cc: conversion with check sql/sql_update.cc: conversion with check sql/sql_yacc.yy: conversion with check --- sql/sql_update.cc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'sql/sql_update.cc') diff --git a/sql/sql_update.cc b/sql/sql_update.cc index b00a8ba851c..be69935a49c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -508,14 +508,7 @@ multi_update::prepare(List &values, SELECT_LEX_UNIT *u) counter++; } } - /* - - There are (SELECT_LEX*) pointer conversion here global union parameters - can't be used in multiupdate - - TODO: check is thd->lex.current_select == &thd->lex.select_lex? - */ - init_ftfuncs(thd, (SELECT_LEX*)thd->lex.current_select, 1); + init_ftfuncs(thd, thd->lex.current_select->select_lex(), 1); error = 0; // Timestamps do not need to be restored, so far ... DBUG_RETURN(0); } -- cgit v1.2.1