sql_lex.h		sql_lex.h
	/* 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 751		skipping to change at line 752
	/*		/*
	ORDER BY clause.		ORDER BY clause.
	This list may be mutated during optimization (by remove_const()),		This list may be mutated during optimization (by remove_const()),
	so for prepared statements, we keep a copy of the ORDER.next pointers i n		so for prepared statements, we keep a copy of the ORDER.next pointers i n
	order_list_ptrs, and re-establish the original list before each executi on.		order_list_ptrs, and re-establish the original list before each executi on.
	*/		*/
	SQL_I_List<ORDER> order_list;		SQL_I_List<ORDER> order_list;
	Group_list_ptrs *order_list_ptrs;		Group_list_ptrs *order_list_ptrs;
	SQL_I_List<ORDER> *gorder_list;		SQL_I_List<ORDER> gorder_list;
	Item *select_limit, *offset_limit; /* LIMIT clause parameters */		Item *select_limit, *offset_limit; /* LIMIT clause parameters */
	/// Array of pointers to top elements of all_fields list		/// Array of pointers to top elements of all_fields list
	Ref_ptr_array ref_pointer_array;		Ref_ptr_array ref_pointer_array;
	/*		/*
	number of items in select_list and HAVING clause used to get number		number of items in select_list and HAVING clause used to get number
	bigger then can be number of entries that will be added to all item		bigger then can be number of entries that will be added to all item
	list during split_sum_func		list during split_sum_func
	*/		*/
	skipping to change at line 897		skipping to change at line 898
	void mark_as_dependent(st_select_lex *last);		void mark_as_dependent(st_select_lex *last);
	bool set_braces(bool value);		bool set_braces(bool value);
	bool inc_in_sum_expr();		bool inc_in_sum_expr();
	uint get_in_sum_expr();		uint get_in_sum_expr();
	bool add_item_to_list(THD *thd, Item *item);		bool add_item_to_list(THD *thd, Item *item);
	bool add_group_to_list(THD *thd, Item *item, bool asc);		bool add_group_to_list(THD *thd, Item *item, bool asc);
	bool add_ftfunc_to_list(Item_func_match *func);		bool add_ftfunc_to_list(Item_func_match *func);
	bool add_order_to_list(THD *thd, Item *item, bool asc);		bool add_order_to_list(THD *thd, Item *item, bool asc);
			bool add_gorder_to_list(THD *thd, Item *item, bool asc);
	TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table,		TABLE_LIST* add_table_to_list(THD *thd, Table_ident *table,
	LEX_STRING *alias,		LEX_STRING *alias,
	ulong table_options,		ulong table_options,
	thr_lock_type flags= TL_UNLOCK,		thr_lock_type flags= TL_UNLOCK,
	enum_mdl_type mdl_type= MDL_SHARED_READ,		enum_mdl_type mdl_type= MDL_SHARED_READ,
	List<Index_hint> *hints= 0,		List<Index_hint> *hints= 0,
	List<String> *partition_names= 0,		List<String> *partition_names= 0,
	LEX_STRING *option= 0);		LEX_STRING *option= 0);
	TABLE_LIST* get_table_list();		TABLE_LIST* get_table_list();
	bool init_nested_join(THD *thd);		bool init_nested_join(THD *thd);
End of changes. 3 change blocks.
	3 lines changed or deleted		4 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/