mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-28 11:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/timka/mysql/src/5.0-tmp-merge

Browse source 
into  mysql.com:/home/timka/mysql/src/5.1-merge


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
This commit is contained in:
unknown 2006-04-04 14:35:17 +03:00
commit 7b61256f68
5 changed files with 78 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item.h
View file

@ -741,6 +741,7 @@ public:
virtual bool remove_fixed(byte * arg) { fixed= 0; return 0; }
virtual bool cleanup_processor(byte *arg);
virtual bool collect_item_field_processor(byte * arg) { return 0; }
virtual bool find_item_in_field_list_processor(byte *arg) { return 0; }
virtual bool change_context_processor(byte *context) { return 0; }
virtual bool reset_query_id_processor(byte *query_id) { return 0; }
@ -1193,6 +1194,7 @@ public:
bool is_null() { return field->is_null(); }
Item *get_tmp_table_item(THD *thd);
bool collect_item_field_processor(byte * arg);
bool find_item_in_field_list_processor(byte *arg);
bool reset_query_id_processor(byte *arg)
{
field->query_id= *((query_id_t *) arg);