Commit f8a91e31 authored by unknown's avatar unknown
Browse files

BUG#18198: Partition function bug 

Review fixes


sql/item_cmpfunc.h:
  Fixes after review
sql/item_strfunc.h:
  Fixes after review
parent 840840bd

sql/item_cmpfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -1134,7 +1134,7 @@ class Item_func_regex :public Item_bool_func 
  void print(String *str) { print_op(str); }

  CHARSET_INFO *compare_collation() { return cmp_collation.collation; }

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg); }

  { return safe_for_binary_collation(int_arg); }

};



#else

sql/item_strfunc.h

+0 −14
Original line number Diff line number Diff line
@@ -59,8 +59,6 @@ class Item_func_sha :public Item_str_func 
  String *val_str(String *);    

  void fix_length_and_dec();      

  const char *func_name() const { return "sha"; }	

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};



class Item_func_aes_encrypt :public Item_str_func
@@ -217,8 +215,6 @@ class Item_func_substr :public Item_str_func 
  String *val_str(String *);

  void fix_length_and_dec();

  const char *func_name() const { return "substr"; }

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};
@@ -230,8 +226,6 @@ class Item_func_substr_index :public Item_str_func 
  String *val_str(String *);

  void fix_length_and_dec();

  const char *func_name() const { return "substring_index"; }

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};
@@ -246,8 +240,6 @@ class Item_func_trim :public Item_str_func 
  String *val_str(String *);

  void fix_length_and_dec();

  const char *func_name() const { return "trim"; }

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};
@@ -795,8 +787,6 @@ class Item_func_uncompressed_length : public Item_int_func 
  const char *func_name() const{return "uncompressed_length";}

  void fix_length_and_dec() { max_length=10; }

  longlong val_int();

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};



#ifdef HAVE_COMPRESS
@@ -813,8 +803,6 @@ class Item_func_compress: public Item_str_func 
  void fix_length_and_dec(){max_length= (args[0]->max_length*120)/100+12;}

  const char *func_name() const{return "compress";}

  String *val_str(String *) ZLIB_DEPENDED_FUNCTION

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};



class Item_func_uncompress: public Item_str_func
@@ -825,8 +813,6 @@ class Item_func_uncompress: public Item_str_func 
  void fix_length_and_dec(){max_length= MAX_BLOB_WIDTH;}

  const char *func_name() const{return "uncompress";}

  String *val_str(String *) ZLIB_DEPENDED_FUNCTION

  bool check_partition_func_processor(byte *int_arg)

  { return safe_for_single_char_collation(int_arg);}

};



#define UUID_LENGTH (8+1+4+1+4+1+4+1+12)