Commit bdf32845 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kgeorge/mysql/4.1/warnings 

into  mysql.com:/home/kgeorge/mysql/5.0/warnings


sql/opt_range.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/item_cmpfunc.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/spatial.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
sql/sql_select.h:
  resolve the conflicts in 4.1->5.0 merge of the gcc 4.1 warnings in favor of 
  5.0 code
parents 8f42d836 1ae69b6b

sql/opt_range.cc

+2 −2
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ class SEL_ARG :public Sql_alloc 
  SEL_ARG(Field *field, uint8 part, char *min_value, char *max_value,

	  uint8 min_flag, uint8 max_flag, uint8 maybe_flag);

  SEL_ARG(enum Type type_arg)

    :elements(1),use_count(1),left(0),next_key_part(0),color(BLACK),

     type(type_arg),min_flag(0)

    :min_flag(0),elements(1),use_count(1),left(0),next_key_part(0),

    color(BLACK), type(type_arg)

  {}

  inline bool is_same(SEL_ARG *arg)

  {