summaryrefslogtreecommitdiff
path: root/sql/sql_select.h
diff options
context:
space:
mode:
authorunknown <dlenev@mysql.com>2006-02-27 20:00:03 +0300
committerunknown <dlenev@mysql.com>2006-02-27 20:00:03 +0300
commit6e7d47e243ee6fef13392fba7d3995c58d16fd87 (patch)
treea889c7ecad09d0d8e0c342201479d0fecdbbce12 /sql/sql_select.h
parentac24b2b7282d1fb3575cf1db842a60e7892bd9ef (diff)
parenta431e91279b53652f50f2a2ccab0e5ea62db4cc9 (diff)
downloadmariadb-git-6e7d47e243ee6fef13392fba7d3995c58d16fd87.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg13525 sql/field.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_select.h: Manual merge.
Diffstat (limited to 'sql/sql_select.h')
-rw-r--r--sql/sql_select.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h
index 95a71142426..01ed8048e4a 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,6 @@ public:
init(thd_arg, fields_arg, select_options_arg, result_arg);
}
-
void init(THD *thd_arg, List<Item> &fields_arg, ulonglong select_options_arg,
select_result *result_arg)
{