Commit 1ae69b6b authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/kgeorge/mysql/4.1/warnings
parents 2eb16be0 730d1661

sql/item_cmpfunc.h

+14 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ class Item_in_optimizer: public Item_bool_func 
class Comp_creator

{

public:

  Comp_creator() {}                             /* Remove gcc warning */

  virtual ~Comp_creator() {}                    /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const = 0;

  virtual const char* symbol(bool invert) const = 0;

  virtual bool eqne_op() const = 0;
@@ -133,6 +135,8 @@ class Comp_creator 
class Eq_creator :public Comp_creator

{

public:

  Eq_creator() {}                               /* Remove gcc warning */

  virtual ~Eq_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? "<>" : "="; }

  virtual bool eqne_op() const { return 1; }
@@ -142,6 +146,8 @@ class Eq_creator :public Comp_creator 
class Ne_creator :public Comp_creator

{

public:

  Ne_creator() {}                               /* Remove gcc warning */

  virtual ~Ne_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? "=" : "<>"; }

  virtual bool eqne_op() const { return 1; }
@@ -151,6 +157,8 @@ class Ne_creator :public Comp_creator 
class Gt_creator :public Comp_creator

{

public:

  Gt_creator() {}                               /* Remove gcc warning */

  virtual ~Gt_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? "<=" : ">"; }

  virtual bool eqne_op() const { return 0; }
@@ -160,6 +168,8 @@ class Gt_creator :public Comp_creator 
class Lt_creator :public Comp_creator

{

public:

  Lt_creator() {}                               /* Remove gcc warning */

  virtual ~Lt_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? ">=" : "<"; }

  virtual bool eqne_op() const { return 0; }
@@ -169,6 +179,8 @@ class Lt_creator :public Comp_creator 
class Ge_creator :public Comp_creator

{

public:

  Ge_creator() {}                               /* Remove gcc warning */

  virtual ~Ge_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? "<" : ">="; }

  virtual bool eqne_op() const { return 0; }
@@ -178,6 +190,8 @@ class Ge_creator :public Comp_creator 
class Le_creator :public Comp_creator

{

public:

  Le_creator() {}                               /* Remove gcc warning */

  virtual ~Le_creator() {}                      /* Remove gcc warning */

  virtual Item_bool_func2* create(Item *a, Item *b) const;

  virtual const char* symbol(bool invert) const { return invert? ">" : "<="; }

  virtual bool eqne_op() const { return 0; }

sql/opt_range.cc

+2 −2
Original line number Diff line number Diff line
@@ -63,8 +63,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)

  {

sql/spatial.h

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,8 @@ struct Geometry_buffer; 
class Geometry

{

public:

  Geometry() {}                                 /* remove gcc warning */

  virtual ~Geometry() {}                        /* remove gcc warning */

  static void *operator new(size_t size, void *buffer)

  {

    return buffer;
@@ -173,6 +175,8 @@ class Geometry 
  static void operator delete(void *ptr, void *buffer)

  {}



  static void operator delete(void *buffer) {}  /* remove gcc warning */



  enum wkbType

  {

    wkb_point= 1,

sql/sql_select.h

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ class JOIN :public Sql_alloc 
  }



  JOIN(JOIN &join)

    :fields_list(join.fields_list)

    :Sql_alloc(), fields_list(join.fields_list)

  {

    init(join.thd, join.fields_list, join.select_options,

         join.result);

sql/sql_update.cc

+1 −1
Original line number Diff line number Diff line
@@ -1094,7 +1094,7 @@ bool multi_update::send_data(List<Item> &not_used_values) 
      memcpy((char*) tmp_table->field[0]->ptr,

	     (char*) table->file->ref, table->file->ref_length);

      /* Write row, ignoring duplicated updates to a row */

      if (error= tmp_table->file->write_row(tmp_table->record[0]))

      if ((error= tmp_table->file->write_row(tmp_table->record[0])))

      {

        if (error != HA_ERR_FOUND_DUPP_KEY &&

            error != HA_ERR_FOUND_DUPP_UNIQUE &&