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.cc | |
| 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.cc')
| -rw-r--r-- | sql/sql_lex.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 586706be6c1..0d3ab196aa5 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1711,6 +1711,7 @@ TABLE_LIST *st_lex::link_first_table_back(TABLE_LIST *tables, st_select_lex::print is in sql_select.h st_select_lex_unit::prepare, st_select_lex_unit::exec, - st_select_lex_unit::cleanup, st_select_lex_unit::reinit_exec_mechanism + st_select_lex_unit::cleanup, st_select_lex_unit::reinit_exec_mechanism, + st_select_lex_unit::change_result are in sql_union.cc */ |