diff options
author | unknown <gkodinov@mysql.com> | 2006-06-28 16:28:29 +0300 |
---|---|---|
committer | unknown <gkodinov@mysql.com> | 2006-06-28 16:28:29 +0300 |
commit | 730d16614db30e76938ab3eccf09ce7c1528d334 (patch) | |
tree | 8f6f02345cdd926c0af1e67a5d6e5063c631876e /sql | |
parent | d62551af39fc05b3c7184fbf20d949376a801052 (diff) | |
download | mariadb-git-730d16614db30e76938ab3eccf09ce7c1528d334.tar.gz |
gcc 4.1 linux warning fixes backported from 5.0.
sql/item_cmpfunc.h:
gcc 4.1 linux warning fixes backported from 5.0
sql/opt_range.cc:
gcc 4.1 linux warning fixes.
sql/spatial.h:
gcc 4.1 linux warning fixes backported from 5.0
sql/sql_select.h:
gcc 4.1 linux warning fixes.
sql/sql_update.cc:
gcc 4.1 linux warning fixes.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/item_cmpfunc.h | 14 | ||||
-rw-r--r-- | sql/opt_range.cc | 4 | ||||
-rw-r--r-- | sql/spatial.h | 4 | ||||
-rw-r--r-- | sql/sql_select.h | 2 | ||||
-rw-r--r-- | sql/sql_update.cc | 2 |
5 files changed, 22 insertions, 4 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 68852b5a5f6..73abe208d9e 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -124,6 +124,8 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: 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 @@ public: 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; } diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 67141aab6ce..34f11e4968a 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -63,8 +63,8 @@ public: 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) { diff --git a/sql/spatial.h b/sql/spatial.h index 206958b3eaf..378233a2156 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -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 @@ public: static void operator delete(void *ptr, void *buffer) {} + static void operator delete(void *buffer) {} /* remove gcc warning */ + enum wkbType { wkb_point= 1, diff --git a/sql/sql_select.h b/sql/sql_select.h index 75cd0b4d797..c61ef4fb92b 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -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); diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 16423b39786..089d0bf0660 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1094,7 +1094,7 @@ bool multi_update::send_data(List<Item> ¬_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 && |