mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge mysql.com:/home/ram/work/mysql-5.0-maint

Browse source 
into  mysql.com:/home/ram/work/b28464.new/b28464.new.5.0


sql/item.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item.cc:
  SCCS merged
This commit is contained in:
unknown 2007-05-24 20:21:04 +05:00
commit 7be03ef01f
5 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sql/item.h
View file

@ -1359,8 +1359,10 @@ class Item_param :public Item
char cnvbuf[MAX_FIELD_WIDTH];
String cnvstr;
Item *cnvitem;
public:
bool strict_type;
enum Item_result required_result_type;
public:
enum enum_item_param_state
{
NO_VALUE, NULL_VALUE, INT_VALUE, REAL_VALUE,
@ -1488,6 +1490,11 @@ public:
Otherwise return FALSE.
*/
bool eq(const Item *item, bool binary_cmp) const;
void set_strict_type(enum Item_result result_type_arg)
{
strict_type= TRUE;
required_result_type= result_type_arg;
}
};