diff options
| author | unknown <sergefp@mysql.com> | 2007-01-24 19:13:28 +0300 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2007-01-24 19:13:28 +0300 |
| commit | dfeac169a6601edacfbc3b53857257eb60a5671b (patch) | |
| tree | 78a7852eaf91c145bb633eff524fd01716a2908d /sql/sql_lex.h | |
| parent | bf12442461aff3b6a187e9ea49539632c3e68f4f (diff) | |
| parent | 5f97dc6e9e0b21df249f3c2fa26d8f7616797097 (diff) | |
| download | mariadb-git-dfeac169a6601edacfbc3b53857257eb60a5671b.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/psergey/mysql-5.0-bug8804-r12
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/subselect.result:
Manual Merge
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 57e9f718636..d9dbc80e9a7 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -469,7 +469,7 @@ public: void set_thd(THD *thd_arg) { thd= thd_arg; } friend void lex_start(THD *thd, uchar *buf, uint length); - friend int subselect_union_engine::exec(bool); + friend int subselect_union_engine::exec(); List<Item> *get_unit_column_types(); }; |