mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into mikael-ronstr-ms-dator.local:/Users/mikron/mysql_clones/bug18198 sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.h: Auto merged sql/sql_partition.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/item_timefunc.h: SCCS merged
This commit is contained in:
@@ -50,7 +50,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "md5"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -94,7 +93,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "concat"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
class Item_func_concat_ws :public Item_str_func
|
||||
@@ -116,7 +114,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "reverse"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -154,7 +151,6 @@ protected:
|
||||
public:
|
||||
Item_str_conv(Item *item) :Item_str_func(item) {}
|
||||
String *val_str(String *);
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -455,7 +451,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "soundex"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -549,7 +544,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "rpad"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -562,7 +556,6 @@ public:
|
||||
String *val_str(String *);
|
||||
void fix_length_and_dec();
|
||||
const char *func_name() const { return "lpad"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -577,7 +570,6 @@ public:
|
||||
collation.set(default_charset());
|
||||
max_length= 64;
|
||||
}
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -594,7 +586,6 @@ public:
|
||||
decimals=0;
|
||||
max_length=args[0]->max_length*2*collation.collation->mbmaxlen;
|
||||
}
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
class Item_func_unhex :public Item_str_func
|
||||
@@ -614,7 +605,6 @@ public:
|
||||
decimals=0;
|
||||
max_length=(1+args[0]->max_length)/2;
|
||||
}
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -638,7 +628,6 @@ public:
|
||||
}
|
||||
void print(String *str);
|
||||
const char *func_name() const { return "cast_as_binary"; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
|
||||
@@ -678,7 +667,6 @@ public:
|
||||
String* val_str(String* str);
|
||||
const char *func_name() const { return "inet_ntoa"; }
|
||||
void fix_length_and_dec() { decimals = 0; max_length=3*8+7; }
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
class Item_func_quote :public Item_str_func
|
||||
@@ -693,7 +681,6 @@ public:
|
||||
collation.set(args[0]->collation);
|
||||
max_length= args[0]->max_length * 2 + 2;
|
||||
}
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
class Item_func_conv_charset :public Item_str_func
|
||||
@@ -794,7 +781,6 @@ public:
|
||||
const char *func_name() const { return "crc32"; }
|
||||
void fix_length_and_dec() { max_length=10; }
|
||||
longlong val_int();
|
||||
bool check_partition_func_processor(byte *int_arg) {return FALSE;}
|
||||
};
|
||||
|
||||
class Item_func_uncompressed_length : public Item_int_func
|
||||
|
||||
Reference in New Issue
Block a user