summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/field.cc2
-rw-r--r--sql/handler.h2
-rw-r--r--sql/item.cc3
-rw-r--r--sql/item.h5
-rw-r--r--sql/item_cmpfunc.h17
-rw-r--r--sql/log_event.h1
-rw-r--r--sql/mysql_priv.h7
-rw-r--r--sql/opt_range.cc10
-rw-r--r--sql/parse_file.h3
-rw-r--r--sql/sp_rcontext.h1
-rw-r--r--sql/spatial.h16
-rw-r--r--sql/sql_base.cc13
-rw-r--r--sql/sql_cache.h8
-rw-r--r--sql/sql_class.cc1
-rw-r--r--sql/sql_class.h3
-rw-r--r--sql/sql_db.cc8
-rw-r--r--sql/sql_parse.cc9
-rw-r--r--sql/sql_select.h3
-rw-r--r--sql/table.h4
-rw-r--r--sql/tztime.cc2
-rw-r--r--sql/tztime.h1
21 files changed, 100 insertions, 19 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 72e28cbda9c..c2c41bc2ee9 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -5266,7 +5266,7 @@ int Field_date::store(longlong nr, bool unsigned_val)
}
if (nr >= 19000000000000.0 && nr <= 99991231235959.0)
- nr=floor(nr/1000000.0); // Timestamp to date
+ nr= (longlong) floor(nr/1000000.0); // Timestamp to date
if (error)
set_datetime_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
diff --git a/sql/handler.h b/sql/handler.h
index 2d415854d2b..d4124f70310 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -272,6 +272,7 @@ struct xid_t {
long bqual_length;
char data[XIDDATASIZE]; // not \0-terminated !
+ xid_t() {} /* Remove gcc warning */
bool eq(struct xid_t *xid)
{ return eq(xid->gtrid_length, xid->bqual_length, xid->data); }
bool eq(long g, long b, const char *d)
@@ -646,6 +647,7 @@ typedef class Item COND;
typedef struct st_ha_check_opt
{
+ st_ha_check_opt() {} /* Remove gcc warning */
ulong sort_buffer_size;
uint flags; /* isam layer flags (e.g. for myisamchk) */
uint sql_flags; /* sql layer flags - for something myisamchk cannot do */
diff --git a/sql/item.cc b/sql/item.cc
index 7480c494308..bbe7f3d2f9e 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -375,9 +375,6 @@ void Item::print_item_w_name(String *str)
void Item::cleanup()
{
DBUG_ENTER("Item::cleanup");
- DBUG_PRINT("info", ("Item: 0x%lx, name %s, original name %s",
- this, name ? name : "(null)",
- orig_name ? orig_name : "null"));
fixed=0;
marker= 0;
if (orig_name)
diff --git a/sql/item.h b/sql/item.h
index ae6aaeb82f0..1be0529af25 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -164,7 +164,8 @@ struct Hybrid_type_traits
virtual my_decimal *val_decimal(Hybrid_type *val, my_decimal *buf) const;
virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const;
static const Hybrid_type_traits *instance();
- Hybrid_type_traits() {};
+ Hybrid_type_traits() {}
+ virtual ~Hybrid_type_traits() {}
};
@@ -339,6 +340,7 @@ private:
bool save_resolve_in_select_list;
public:
+ Name_resolution_context_state() {} /* Remove gcc warning */
TABLE_LIST *save_next_local;
public:
@@ -1055,6 +1057,7 @@ bool agg_item_charsets(DTCollation &c, const char *name,
class Item_num: public Item
{
public:
+ Item_num() {} /* Remove gcc warning */
virtual Item_num *neg()= 0;
Item *safe_charset_converter(CHARSET_INFO *tocs);
};
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 15aebd2492c..89aafa5721e 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -128,6 +128,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;
@@ -137,6 +139,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; }
@@ -146,6 +150,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; }
@@ -155,6 +161,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; }
@@ -164,6 +172,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; }
@@ -173,6 +183,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; }
@@ -182,6 +194,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; }
@@ -739,6 +753,7 @@ class cmp_item_int :public cmp_item
{
longlong value;
public:
+ cmp_item_int() {} /* Remove gcc warning */
void store_value(Item *item)
{
value= item->val_int();
@@ -759,6 +774,7 @@ class cmp_item_real :public cmp_item
{
double value;
public:
+ cmp_item_real() {} /* Remove gcc warning */
void store_value(Item *item)
{
value= item->val_real();
@@ -780,6 +796,7 @@ class cmp_item_decimal :public cmp_item
{
my_decimal value;
public:
+ cmp_item_decimal() {} /* Remove gcc warning */
void store_value(Item *item);
int cmp(Item *arg);
int compare(cmp_item *c);
diff --git a/sql/log_event.h b/sql/log_event.h
index a7c532d4c24..98d56fc42ec 100644
--- a/sql/log_event.h
+++ b/sql/log_event.h
@@ -131,6 +131,7 @@ struct old_sql_ex
****************************************************************************/
struct sql_ex_info
{
+ sql_ex_info() {} /* Remove gcc warning */
char* field_term;
char* enclosed;
char* line_term;
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 8e85e70fccd..5d1cfd4fed0 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -434,6 +434,7 @@ typedef struct st_sql_list {
byte *first;
byte **next;
+ st_sql_list() {} /* Remove gcc warning */
inline void empty()
{
elements=0;
@@ -1040,7 +1041,7 @@ bool close_thread_table(THD *thd, TABLE **table_ptr);
void close_temporary_tables(THD *thd);
void close_tables_for_reopen(THD *thd, TABLE_LIST **tables);
TABLE_LIST *find_table_in_list(TABLE_LIST *table,
- uint offset_to_list,
+ st_table_list *TABLE_LIST::*link,
const char *db_name,
const char *table_name);
TABLE_LIST *unique_table(THD *thd, TABLE_LIST *table, TABLE_LIST *table_list);
@@ -1130,7 +1131,7 @@ inline TABLE_LIST *find_table_in_global_list(TABLE_LIST *table,
const char *db_name,
const char *table_name)
{
- return find_table_in_list(table, offsetof(TABLE_LIST, next_global),
+ return find_table_in_list(table, &TABLE_LIST::next_global,
db_name, table_name);
}
@@ -1138,7 +1139,7 @@ inline TABLE_LIST *find_table_in_local_list(TABLE_LIST *table,
const char *db_name,
const char *table_name)
{
- return find_table_in_list(table, offsetof(TABLE_LIST, next_local),
+ return find_table_in_list(table, &TABLE_LIST::next_local,
db_name, table_name);
}
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 0028bbc1ec3..e42be40be81 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1601,6 +1601,8 @@ public:
{ return (void*) alloc_root(mem_root, (uint) size); }
static void operator delete(void *ptr,size_t size) { TRASH(ptr, size); }
static void operator delete(void *ptr, MEM_ROOT *mem_root) { /* Never called */ }
+ virtual ~TABLE_READ_PLAN() {} /* Remove gcc warning */
+
};
class TRP_ROR_INTERSECT;
@@ -1624,6 +1626,7 @@ public:
TRP_RANGE(SEL_ARG *key_arg, uint idx_arg)
: key(key_arg), key_idx(idx_arg)
{}
+ virtual ~TRP_RANGE() {} /* Remove gcc warning */
QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
MEM_ROOT *parent_alloc)
@@ -1645,6 +1648,8 @@ public:
class TRP_ROR_INTERSECT : public TABLE_READ_PLAN
{
public:
+ TRP_ROR_INTERSECT() {} /* Remove gcc warning */
+ virtual ~TRP_ROR_INTERSECT() {} /* Remove gcc warning */
QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
MEM_ROOT *parent_alloc);
@@ -1666,6 +1671,8 @@ public:
class TRP_ROR_UNION : public TABLE_READ_PLAN
{
public:
+ TRP_ROR_UNION() {} /* Remove gcc warning */
+ virtual ~TRP_ROR_UNION() {} /* Remove gcc warning */
QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
MEM_ROOT *parent_alloc);
TABLE_READ_PLAN **first_ror; /* array of ptrs to plans for merged scans */
@@ -1682,6 +1689,8 @@ public:
class TRP_INDEX_MERGE : public TABLE_READ_PLAN
{
public:
+ TRP_INDEX_MERGE() {} /* Remove gcc warning */
+ virtual ~TRP_INDEX_MERGE() {} /* Remove gcc warning */
QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
MEM_ROOT *parent_alloc);
TRP_RANGE **range_scans; /* array of ptrs to plans of merged scans */
@@ -1731,6 +1740,7 @@ public:
if (key_infix_len)
memcpy(this->key_infix, key_infix_arg, key_infix_len);
}
+ virtual ~TRP_GROUP_MIN_MAX() {} /* Remove gcc warning */
QUICK_SELECT_I *make_quick(PARAM *param, bool retrieve_full_rows,
MEM_ROOT *parent_alloc);
diff --git a/sql/parse_file.h b/sql/parse_file.h
index afa88da2ead..0d5a215fe1a 100644
--- a/sql/parse_file.h
+++ b/sql/parse_file.h
@@ -49,6 +49,8 @@ struct File_option
class Unknown_key_hook
{
public:
+ Unknown_key_hook() {} /* Remove gcc warning */
+ virtual ~Unknown_key_hook() {} /* Remove gcc warning */
virtual bool process_unknown_string(char *&unknown_key, gptr base,
MEM_ROOT *mem_root, char *end)= 0;
};
@@ -59,6 +61,7 @@ public:
class File_parser_dummy_hook: public Unknown_key_hook
{
public:
+ File_parser_dummy_hook() {} /* Remove gcc warning */
virtual bool process_unknown_string(char *&unknown_key, gptr base,
MEM_ROOT *mem_root, char *end);
};
diff --git a/sql/sp_rcontext.h b/sql/sp_rcontext.h
index c3c05228eef..e7393902e72 100644
--- a/sql/sp_rcontext.h
+++ b/sql/sp_rcontext.h
@@ -268,6 +268,7 @@ class Select_fetch_into_spvars: public select_result_interceptor
List<struct sp_pvar> *spvar_list;
uint field_count;
public:
+ Select_fetch_into_spvars() {} /* Remove gcc warning */
uint get_field_count() { return field_count; }
void set_spvar_list(List<struct sp_pvar> *vars) { spvar_list= vars; }
diff --git a/sql/spatial.h b/sql/spatial.h
index 527dc750bdc..a6f74a1ada0 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;
@@ -302,6 +304,8 @@ protected:
class Gis_point: public Geometry
{
public:
+ Gis_point() {} /* Remove gcc warning */
+ virtual ~Gis_point() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -349,6 +353,8 @@ public:
class Gis_line_string: public Geometry
{
public:
+ Gis_line_string() {} /* Remove gcc warning */
+ virtual ~Gis_line_string() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -375,6 +381,8 @@ public:
class Gis_polygon: public Geometry
{
public:
+ Gis_polygon() {} /* Remove gcc warning */
+ virtual ~Gis_polygon() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -401,6 +409,8 @@ public:
class Gis_multi_point: public Geometry
{
public:
+ Gis_multi_point() {} /* Remove gcc warning */
+ virtual ~Gis_multi_point() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -423,6 +433,8 @@ public:
class Gis_multi_line_string: public Geometry
{
public:
+ Gis_multi_line_string() {} /* Remove gcc warning */
+ virtual ~Gis_multi_line_string() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -447,6 +459,8 @@ public:
class Gis_multi_polygon: public Geometry
{
public:
+ Gis_multi_polygon() {} /* Remove gcc warning */
+ virtual ~Gis_multi_polygon() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
@@ -471,6 +485,8 @@ public:
class Gis_geometry_collection: public Geometry
{
public:
+ Gis_geometry_collection() {} /* Remove gcc warning */
+ virtual ~Gis_geometry_collection() {} /* Remove gcc warning */
uint32 get_data_size() const;
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c4cb7ddbc4a..6d564841e42 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -917,6 +917,15 @@ bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
DESCRIPTION
Marks all tables in the list which were used by current substatement
(they are marked by its query_id) as free for reuse.
+
+ NOTE
+ The reason we reset query_id is that it's not enough to just test
+ if table->query_id != thd->query_id to know if a table is in use.
+
+ For example
+ SELECT f1_that_uses_t1() FROM t1;
+ In f1_that_uses_t1() we will see one instance of t1 where query_id is
+ set to query_id of original query.
*/
static void mark_used_tables_as_free_for_reuse(THD *thd, TABLE *table)
@@ -1230,11 +1239,11 @@ void close_temporary_tables(THD *thd)
*/
TABLE_LIST *find_table_in_list(TABLE_LIST *table,
- uint offset,
+ st_table_list *TABLE_LIST::*link,
const char *db_name,
const char *table_name)
{
- for (; table; table= *(TABLE_LIST **) ((char*) table + offset))
+ for (; table; table= table->*link )
{
if ((table->table == 0 || table->table->s->tmp_table == NO_TMP_TABLE) &&
strcmp(table->db, db_name) == 0 &&
diff --git a/sql/sql_cache.h b/sql/sql_cache.h
index b7531696150..29d314d3c44 100644
--- a/sql/sql_cache.h
+++ b/sql/sql_cache.h
@@ -69,6 +69,7 @@ class Query_cache;
struct Query_cache_block_table
{
+ Query_cache_block_table() {} /* Remove gcc warning */
TABLE_COUNTER_TYPE n; // numbr in table (from 0)
Query_cache_block_table *next, *prev;
Query_cache_table *parent;
@@ -78,6 +79,7 @@ struct Query_cache_block_table
struct Query_cache_block
{
+ Query_cache_block() {} /* Remove gcc warning */
enum block_type {FREE, QUERY, RESULT, RES_CONT, RES_BEG,
RES_INCOMPLETE, TABLE, INCOMPLETE};
@@ -143,6 +145,7 @@ struct Query_cache_query
struct Query_cache_table
{
+ Query_cache_table() {} /* Remove gcc warning */
char *tbl;
uint32 key_len;
uint8 table_type;
@@ -171,6 +174,7 @@ struct Query_cache_table
struct Query_cache_result
{
+ Query_cache_result() {} /* Remove gcc warning */
Query_cache_block *query;
inline gptr data()
@@ -197,6 +201,7 @@ extern "C" void query_cache_invalidate_by_MyISAM_filename(const char* filename);
struct Query_cache_memory_bin
{
+ Query_cache_memory_bin() {} /* Remove gcc warning */
#ifndef DBUG_OFF
ulong size;
#endif
@@ -215,8 +220,7 @@ struct Query_cache_memory_bin
struct Query_cache_memory_bin_step
{
-public:
- Query_cache_memory_bin_step() {}
+ Query_cache_memory_bin_step() {} /* Remove gcc warning */
ulong size;
ulong increment;
uint idx;
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index e68bcb9e281..101ba5781d8 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -992,6 +992,7 @@ bool select_send::send_data(List<Item> &items)
protocol->remove_last_row();
else
DBUG_RETURN(protocol->write());
+ protocol->remove_last_row();
DBUG_RETURN(1);
}
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 00440449be8..d6d8c2ca5b7 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -629,6 +629,7 @@ void xid_cache_delete(XID_STATE *xid_state);
class Security_context {
public:
+ Security_context() {} /* Remove gcc warning */
/*
host - host of the client
user - user of the client, set to NULL until the user has been read from
@@ -1467,6 +1468,7 @@ public:
class select_result_interceptor: public select_result
{
public:
+ select_result_interceptor() {} /* Remove gcc warning */
uint field_count(List<Item> &fields) const { return 0; }
bool send_fields(List<Item> &fields, uint flag) { return FALSE; }
};
@@ -1757,6 +1759,7 @@ class Table_ident :public Sql_alloc
class user_var_entry
{
public:
+ user_var_entry() {} /* Remove gcc warning */
LEX_STRING name;
char *value;
ulong length;
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 885643cf899..efee88329c6 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1233,10 +1233,13 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
#ifndef NO_EMBEDDED_ACCESS_CHECKS
ulong db_access;
Security_context *sctx= thd->security_ctx;
+ LINT_INIT(db_access);
#endif
DBUG_ENTER("mysql_change_db");
DBUG_PRINT("enter",("name: '%s'",name));
+ LINT_INIT(db_length);
+
/* dbname can only be NULL if malloc failed */
if (!dbname || !(db_length= strlen(dbname)))
{
@@ -1254,7 +1257,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if (check_db_name(dbname))
{
my_error(ER_WRONG_DB_NAME, MYF(0), dbname);
- x_free(dbname);
+ my_free(dbname, MYF(0));
DBUG_RETURN(1);
}
DBUG_PRINT("info",("Use database: %s", dbname));
@@ -1303,8 +1306,7 @@ end:
x_free(thd->db);
if (dbname && dbname[0] == 0)
{
- if (!(thd->slave_thread))
- x_free(dbname);
+ my_free(dbname, MYF(0));
thd->db= NULL;
thd->db_length= 0;
}
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index b84eb1cfcb8..a6da751e2c4 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -4972,7 +4972,9 @@ end_with_restore_list:
break;
}
default:
+#ifndef EMBEDDED_LIBRARY
DBUG_ASSERT(0); /* Impossible */
+#endif
send_ok(thd);
break;
}
@@ -6149,10 +6151,11 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
/*
table_list.next points to the last inserted TABLE_LIST->next_local'
element
+ We don't use the offsetof() macro here to avoid warnings from gcc
*/
- previous_table_ref= (TABLE_LIST*) (table_list.next -
- offsetof(TABLE_LIST, next_local));
- DBUG_ASSERT(previous_table_ref);
+ previous_table_ref= (TABLE_LIST*) ((char*) table_list.next -
+ ((char*) &(ptr->next_local) -
+ (char*) ptr));
/*
Set next_name_resolution_table of the previous table reference to point
to the current table reference. In effect the list
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 4f93a4aa996..02ee672b66e 100644
--- a/sql/sql_select.h
+++ b/sql/sql_select.h
@@ -104,6 +104,7 @@ typedef int (*Read_record_func)(struct st_join_table *tab);
Next_select_func setup_end_select_func(JOIN *join);
typedef struct st_join_table {
+ st_join_table() {} /* Remove gcc warning */
TABLE *table;
KEYUSE *keyuse; /* pointer to first used key */
SQL_SELECT *select;
@@ -288,7 +289,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/table.h b/sql/table.h
index d1009ade09b..2bde68e5919 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -216,6 +216,8 @@ typedef struct st_table_share
/* Information for one open table */
struct st_table {
+ st_table() {} /* Remove gcc warning */
+
TABLE_SHARE *s;
handler *file;
#ifdef NOT_YET
@@ -490,6 +492,7 @@ public:
typedef struct st_table_list
{
+ st_table_list() {} /* Remove gcc warning */
/*
List of tables local to a subquery (used by SQL_LIST). Considers
views as leaves (unlike 'next_leaf' below). Created at parse time
@@ -722,6 +725,7 @@ class Item;
class Field_iterator: public Sql_alloc
{
public:
+ Field_iterator() {} /* Remove gcc warning */
virtual ~Field_iterator() {}
virtual void set(TABLE_LIST *)= 0;
virtual void next()= 0;
diff --git a/sql/tztime.cc b/sql/tztime.cc
index 96eb31449da..94c1eb8ac63 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -973,6 +973,7 @@ static const String tz_SYSTEM_name("SYSTEM", 6, &my_charset_latin1);
class Time_zone_system : public Time_zone
{
public:
+ Time_zone_system() {} /* Remove gcc warning */
virtual my_time_t TIME_to_gmt_sec(const TIME *t,
my_bool *in_dst_time_gap) const;
virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const;
@@ -1066,6 +1067,7 @@ Time_zone_system::get_name() const
class Time_zone_utc : public Time_zone
{
public:
+ Time_zone_utc() {} /* Remove gcc warning */
virtual my_time_t TIME_to_gmt_sec(const TIME *t,
my_bool *in_dst_time_gap) const;
virtual void gmt_sec_to_TIME(TIME *tmp, my_time_t t) const;
diff --git a/sql/tztime.h b/sql/tztime.h
index 2d574eadf18..42e50988e52 100644
--- a/sql/tztime.h
+++ b/sql/tztime.h
@@ -30,6 +30,7 @@
class Time_zone: public Sql_alloc
{
public:
+ Time_zone() {} /* Remove gcc warning */
/*
Converts local time in broken down TIME representation to
my_time_t (UTC seconds since Epoch) represenation.
View Lorry Controller Status