1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
mikael@dator6.(none) 2007-06-13 16:12:02 +02:00
parent 920a8ed5b3
commit cb401dde68
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/item.h
View File

@ -1627,7 +1627,7 @@ public:
uint decimal_precision() const uint decimal_precision() const
{ return (uint)(max_length - test(value < 0)); } { return (uint)(max_length - test(value < 0)); }
bool eq(const Item *, bool binary_cmp) const; bool eq(const Item *, bool binary_cmp) const;
bool check_partition_func_processor(byte *bool_arg) { return FALSE;} bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
}; };
@ -1645,7 +1645,7 @@ public:
void print(String *str); void print(String *str);
Item_num *neg (); Item_num *neg ();
uint decimal_precision() const { return max_length; } uint decimal_precision() const { return max_length; }
bool check_partition_func_processor(byte *bool_arg) { return FALSE;} bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
}; };
@ -1688,7 +1688,7 @@ public:
uint decimal_precision() const { return decimal_value.precision(); } uint decimal_precision() const { return decimal_value.precision(); }
bool eq(const Item *, bool binary_cmp) const; bool eq(const Item *, bool binary_cmp) const;
void set_decimal_value(my_decimal *value_par); void set_decimal_value(my_decimal *value_par);
bool check_partition_func_processor(byte *bool_arg) { return FALSE;} bool check_partition_func_processor(uchar *bool_arg) { return FALSE;}
}; };

8
sql/item_func.h
View File

@ -439,7 +439,7 @@ public:
void fix_length_and_dec(); void fix_length_and_dec();
void fix_num_length_and_dec(); void fix_num_length_and_dec();
uint decimal_precision() const { return args[0]->decimal_precision(); } uint decimal_precision() const { return args[0]->decimal_precision(); }
bool check_partition_func_processor(byte *int_arg) {return FALSE;} bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
}; };
@ -452,7 +452,7 @@ public:
my_decimal *decimal_op(my_decimal *); my_decimal *decimal_op(my_decimal *);
const char *func_name() const { return "abs"; } const char *func_name() const { return "abs"; }
void fix_length_and_dec(); void fix_length_and_dec();
bool check_partition_func_processor(byte *int_arg) {return FALSE;} bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
}; };
// A class to handle logarithmic and trigonometric functions // A class to handle logarithmic and trigonometric functions
@ -619,7 +619,7 @@ public:
longlong int_op(); longlong int_op();
double real_op(); double real_op();
my_decimal *decimal_op(my_decimal *); my_decimal *decimal_op(my_decimal *);
bool check_partition_func_processor(byte *int_arg) {return FALSE;} bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
}; };
@ -631,7 +631,7 @@ public:
longlong int_op(); longlong int_op();
double real_op(); double real_op();
my_decimal *decimal_op(my_decimal *); my_decimal *decimal_op(my_decimal *);
bool check_partition_func_processor(byte *int_arg) {return FALSE;} bool check_partition_func_processor(uchar *int_arg) {return FALSE;}
}; };
/* This handles round and truncate */ /* This handles round and truncate */

4
sql/item_timefunc.h
View File

@ -127,7 +127,7 @@ public:
max_length=10*my_charset_bin.mbmaxlen; max_length=10*my_charset_bin.mbmaxlen;
maybe_null=1; maybe_null=1;
} }
bool check_partition_func_processor(byte *int_arg) {return TRUE;} bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
}; };
@ -301,7 +301,7 @@ class Item_func_dayname :public Item_func_weekday
max_length=9*MY_CHARSET_BIN_MB_MAXLEN; max_length=9*MY_CHARSET_BIN_MB_MAXLEN;
maybe_null=1; maybe_null=1;
} }
bool check_partition_func_processor(byte *int_arg) {return TRUE;} bool check_partition_func_processor(uchar *int_arg) {return TRUE;}
}; };