item_sum.h		item_sum.h
	#ifndef ITEM_SUM_INCLUDED		#ifndef ITEM_SUM_INCLUDED
	#define ITEM_SUM_INCLUDED		#define ITEM_SUM_INCLUDED
	/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reser		/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights
	ved.		reserved.
	This program is free software; you can redistribute it and/or modify		This program is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by		it under the terms of the GNU General Public License as published by
	the Free Software Foundation; version 2 of the License.		the Free Software Foundation; version 2 of the License.
	This program is distributed in the hope that it will be useful,		This program is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of		but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	GNU General Public License for more details.		GNU General Public License for more details.
	skipping to change at line 1437		skipping to change at line 1438
	friend int group_concat_key_cmp_with_order(const void* arg,		friend int group_concat_key_cmp_with_order(const void* arg,
	const void* key1,		const void* key1,
	const void* key2);		const void* key2);
	friend int dump_leaf_key(void* key_arg,		friend int dump_leaf_key(void* key_arg,
	element_count count __attribute__((unused)),		element_count count __attribute__((unused)),
	void* item_arg);		void* item_arg);
	public:		public:
	Item_func_group_concat(Name_resolution_context *context_arg,		Item_func_group_concat(Name_resolution_context *context_arg,
	bool is_distinct, List<Item> *is_select,		bool is_distinct, List<Item> *is_select,
	SQL_I_List<ORDER> *is_order, String *is_separator) ;		const SQL_I_List<ORDER> &is_order, String *is_sepa rator);
	Item_func_group_concat(THD *thd, Item_func_group_concat *item);		Item_func_group_concat(THD *thd, Item_func_group_concat *item);
	~Item_func_group_concat();		~Item_func_group_concat();
	void cleanup();		void cleanup();
	enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}		enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
	const char *func_name() const { return "group_concat"; }		const char *func_name() const { return "group_concat"; }
	virtual Item_result result_type () const { return STRING_RESULT; }		virtual Item_result result_type () const { return STRING_RESULT; }
	virtual Field *make_string_field(TABLE *table);		virtual Field *make_string_field(TABLE *table);
	enum_field_types field_type() const		enum_field_types field_type() const
End of changes. 2 change blocks.
	3 lines changed or deleted		3 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/