diff options
| author | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2006-02-25 21:54:34 +0200 |
| commit | 1e2e9e28565d97f140f230824a1adfcea475ee34 (patch) | |
| tree | 69f6c8a1a1bef870aa8b2cbe729b0fd87fcf1c31 /sql/sql_select.h | |
| parent | 066c7148fb5243a0533fd7b6edfe948cb1722548 (diff) | |
| parent | 54274976e7b4a9a28e94a6f0b4f8d064140248db (diff) | |
| download | mariadb-git-1e2e9e28565d97f140f230824a1adfcea475ee34.tar.gz | |
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 3 |
1 files changed, 2 insertions, 1 deletions
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); |