diff options
| author | unknown <igor@rurik.mysql.com> | 2006-04-21 00:36:20 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2006-04-21 00:36:20 -0700 |
| commit | 103fbcee45c0ea5517faf6904ff0b87b15312fbe (patch) | |
| tree | 12430c67bf33ee7014ca554819c453fb616380b5 /sql/sql_lex.h | |
| parent | db623fa89f9b90b21c00184400a1ca94c361010f (diff) | |
| parent | d4f4f5bdaf43b07036d89973ce247fe43009958f (diff) | |
| download | mariadb-git-103fbcee45c0ea5517faf6904ff0b87b15312fbe.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
mysql-test/r/order_by.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/func_gconcat.test:
Manual merge
mysql-test/t/order_by.test:
Manual merge
sql/sql_lex.h:
Manual merge
sql/sql_parse.cc:
Manual merge
sql/sql_union.cc:
Manual merge
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 8512c075f69..34e7ee969b6 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -454,6 +454,7 @@ public: void print(String *str); + bool add_fake_select_lex(THD *thd); void init_prepare_fake_select_lex(THD *thd); inline bool is_prepared() { return prepared; } bool change_result(select_subselect *result, select_subselect *old_result); |