Commit 1ae69b6b authored by unknown's avatar unknown

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

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

parents 2eb16be0 730d1661
...@@ -124,6 +124,8 @@ public: ...@@ -124,6 +124,8 @@ public:
class Comp_creator class Comp_creator
{ {
public: public:
Comp_creator() {} /* Remove gcc warning */
virtual ~Comp_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const = 0; virtual Item_bool_func2* create(Item *a, Item *b) const = 0;
virtual const char* symbol(bool invert) const = 0; virtual const char* symbol(bool invert) const = 0;
virtual bool eqne_op() const = 0; virtual bool eqne_op() const = 0;
...@@ -133,6 +135,8 @@ public: ...@@ -133,6 +135,8 @@ public:
class Eq_creator :public Comp_creator class Eq_creator :public Comp_creator
{ {
public: public:
Eq_creator() {} /* Remove gcc warning */
virtual ~Eq_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? "<>" : "="; } virtual const char* symbol(bool invert) const { return invert? "<>" : "="; }
virtual bool eqne_op() const { return 1; } virtual bool eqne_op() const { return 1; }
...@@ -142,6 +146,8 @@ public: ...@@ -142,6 +146,8 @@ public:
class Ne_creator :public Comp_creator class Ne_creator :public Comp_creator
{ {
public: public:
Ne_creator() {} /* Remove gcc warning */
virtual ~Ne_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? "=" : "<>"; } virtual const char* symbol(bool invert) const { return invert? "=" : "<>"; }
virtual bool eqne_op() const { return 1; } virtual bool eqne_op() const { return 1; }
...@@ -151,6 +157,8 @@ public: ...@@ -151,6 +157,8 @@ public:
class Gt_creator :public Comp_creator class Gt_creator :public Comp_creator
{ {
public: public:
Gt_creator() {} /* Remove gcc warning */
virtual ~Gt_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? "<=" : ">"; } virtual const char* symbol(bool invert) const { return invert? "<=" : ">"; }
virtual bool eqne_op() const { return 0; } virtual bool eqne_op() const { return 0; }
...@@ -160,6 +168,8 @@ public: ...@@ -160,6 +168,8 @@ public:
class Lt_creator :public Comp_creator class Lt_creator :public Comp_creator
{ {
public: public:
Lt_creator() {} /* Remove gcc warning */
virtual ~Lt_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? ">=" : "<"; } virtual const char* symbol(bool invert) const { return invert? ">=" : "<"; }
virtual bool eqne_op() const { return 0; } virtual bool eqne_op() const { return 0; }
...@@ -169,6 +179,8 @@ public: ...@@ -169,6 +179,8 @@ public:
class Ge_creator :public Comp_creator class Ge_creator :public Comp_creator
{ {
public: public:
Ge_creator() {} /* Remove gcc warning */
virtual ~Ge_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? "<" : ">="; } virtual const char* symbol(bool invert) const { return invert? "<" : ">="; }
virtual bool eqne_op() const { return 0; } virtual bool eqne_op() const { return 0; }
...@@ -178,6 +190,8 @@ public: ...@@ -178,6 +190,8 @@ public:
class Le_creator :public Comp_creator class Le_creator :public Comp_creator
{ {
public: public:
Le_creator() {} /* Remove gcc warning */
virtual ~Le_creator() {} /* Remove gcc warning */
virtual Item_bool_func2* create(Item *a, Item *b) const; virtual Item_bool_func2* create(Item *a, Item *b) const;
virtual const char* symbol(bool invert) const { return invert? ">" : "<="; } virtual const char* symbol(bool invert) const { return invert? ">" : "<="; }
virtual bool eqne_op() const { return 0; } virtual bool eqne_op() const { return 0; }
......
...@@ -63,8 +63,8 @@ public: ...@@ -63,8 +63,8 @@ public:
SEL_ARG(Field *field, uint8 part, char *min_value, char *max_value, SEL_ARG(Field *field, uint8 part, char *min_value, char *max_value,
uint8 min_flag, uint8 max_flag, uint8 maybe_flag); uint8 min_flag, uint8 max_flag, uint8 maybe_flag);
SEL_ARG(enum Type type_arg) SEL_ARG(enum Type type_arg)
:elements(1),use_count(1),left(0),next_key_part(0),color(BLACK), :min_flag(0),elements(1),use_count(1),left(0),next_key_part(0),
type(type_arg),min_flag(0) color(BLACK), type(type_arg)
{} {}
inline bool is_same(SEL_ARG *arg) inline bool is_same(SEL_ARG *arg)
{ {
......
...@@ -165,6 +165,8 @@ struct Geometry_buffer; ...@@ -165,6 +165,8 @@ struct Geometry_buffer;
class Geometry class Geometry
{ {
public: public:
Geometry() {} /* remove gcc warning */
virtual ~Geometry() {} /* remove gcc warning */
static void *operator new(size_t size, void *buffer) static void *operator new(size_t size, void *buffer)
{ {
return buffer; return buffer;
...@@ -173,6 +175,8 @@ public: ...@@ -173,6 +175,8 @@ public:
static void operator delete(void *ptr, void *buffer) static void operator delete(void *ptr, void *buffer)
{} {}
static void operator delete(void *buffer) {} /* remove gcc warning */
enum wkbType enum wkbType
{ {
wkb_point= 1, wkb_point= 1,
......
...@@ -229,7 +229,7 @@ class JOIN :public Sql_alloc ...@@ -229,7 +229,7 @@ class JOIN :public Sql_alloc
} }
JOIN(JOIN &join) JOIN(JOIN &join)
:fields_list(join.fields_list) :Sql_alloc(), fields_list(join.fields_list)
{ {
init(join.thd, join.fields_list, join.select_options, init(join.thd, join.fields_list, join.select_options,
join.result); join.result);
......
...@@ -1094,7 +1094,7 @@ bool multi_update::send_data(List<Item> &not_used_values) ...@@ -1094,7 +1094,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
memcpy((char*) tmp_table->field[0]->ptr, memcpy((char*) tmp_table->field[0]->ptr,
(char*) table->file->ref, table->file->ref_length); (char*) table->file->ref, table->file->ref_length);
/* Write row, ignoring duplicated updates to a row */ /* 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 && if (error != HA_ERR_FOUND_DUPP_KEY &&
error != HA_ERR_FOUND_DUPP_UNIQUE && error != HA_ERR_FOUND_DUPP_UNIQUE &&
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment