From 2da4d13569049ff2951a4c59764fcc07d9fca320 Mon Sep 17 00:00:00 2001
From: unknown <bell@sanja.is.com.ua>
Date: Thu, 21 Nov 2002 11:01:33 +0200
Subject: prevent using references on sum function (except HAVING clouse of
 current select) and forward references

include/mysqld_error.h:
  new error message
mysql-test/r/subselect.result:
  new error message
mysql-test/t/subselect.test:
  new error message
sql/item.cc:
  fix_fields indicator
  test on incorrect references
sql/item.h:
  fix_fields indicator
sql/item_cmpfunc.cc:
  fix_fields indicator
sql/item_func.cc:
  fix_fields indicator
sql/item_func.h:
  fix_fields indicator
sql/item_strfunc.cc:
  fix_fields indicator
sql/item_subselect.cc:
  fix_fields indicator
sql/item_sum.cc:
  fix_fields indicator
sql/item_sum.h:
  fix_fields indicator
sql/item_uniq.h:
  fix_fields indicator
sql/share/czech/errmsg.txt:
  new error message
sql/share/danish/errmsg.txt:
  new error message
sql/share/dutch/errmsg.txt:
  new error message
sql/share/english/errmsg.txt:
  new error message
sql/share/estonian/errmsg.txt:
  new error message
sql/share/french/errmsg.txt:
  new error message
sql/share/german/errmsg.txt:
  new error message
sql/share/greek/errmsg.txt:
  new error message
sql/share/hungarian/errmsg.txt:
  new error message
sql/share/italian/errmsg.txt:
  new error message
sql/share/japanese/errmsg.txt:
  new error message
sql/share/korean/errmsg.txt:
  new error message
sql/share/norwegian-ny/errmsg.txt:
  new error message
sql/share/norwegian/errmsg.txt:
  new error message
sql/share/polish/errmsg.txt:
  new error message
sql/share/portuguese/errmsg.txt:
  new error message
sql/share/romanian/errmsg.txt:
  new error message
sql/share/russian/errmsg.txt:
  new error message
sql/share/serbian/errmsg.txt:
  new error message
sql/share/slovak/errmsg.txt:
  new error message
sql/share/spanish/errmsg.txt:
  new error message
sql/share/swedish/errmsg.txt:
  new error message
sql/share/ukrainian/errmsg.txt:
  new error message
---
 sql/item_strfunc.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'sql/item_strfunc.cc')

diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 1a561c9eb34..6a0aaa3b032 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2065,6 +2065,7 @@ bool Item_func_conv_charset::fix_fields(THD *thd,struct st_table_list *tables, I
   const_item_cache=args[0]->const_item();
   set_charset(conv_charset);
   fix_length_and_dec();
+  fixed= 1;
   return 0;
 }
 
@@ -2099,6 +2100,7 @@ bool Item_func_set_collation::fix_fields(THD *thd,struct st_table_list *tables,
   used_tables_cache=args[0]->used_tables();
   const_item_cache=args[0]->const_item();
   fix_length_and_dec();
+  fixed= 1;
   return 0;
 }
 
-- 
cgit v1.2.1