diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:29:23 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-05-14 15:29:23 +0300 |
| commit | aebab97dd0f254652d5ebcb7c1e4817c7109d18c (patch) | |
| tree | ccff3101aa3aa4d8f1caed9c1191aa248bbf5fc0 /sql/sql_lex.h | |
| parent | 8c0e5ebfd372a53cd6b2104c366ac4b6ac4a304b (diff) | |
| parent | 98fbcd9f2c89b9613c240983b5c1870d25473ed4 (diff) | |
| download | mariadb-git-aebab97dd0f254652d5ebcb7c1e4817c7109d18c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.h')
| -rw-r--r-- | sql/sql_lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 6e1e9fdecad..e6a2dcdb754 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -372,6 +372,7 @@ public: void print(String *str); ulong init_prepare_fake_select_lex(THD *thd); + int change_result(select_subselect *result, select_subselect *old_result); friend void mysql_init_query(THD *thd); friend int subselect_union_engine::exec(); |