diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:47:41 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-09 14:47:41 +0200 |
| commit | 8302f040b7314c0b6b4e28ead2394cdb4d0e8d5d (patch) | |
| tree | 7becaf2ef2ba2bf3f53d6afad2278b7aaeda40e0 /sql/sql_lex.cc | |
| parent | 61f0e69cb60b9db858bad3b6de6fa0b8b2f03899 (diff) | |
| parent | 33e2cd7bdbd0d10703471f7ddaf8b02a7adc89cf (diff) | |
| download | mariadb-git-8302f040b7314c0b6b4e28ead2394cdb4d0e8d5d.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1/
into sanja.is.com.ua:/home/bell/mysql/bk/work-prepared-4.1
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 62f255ea178..89529cec720 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1623,7 +1623,11 @@ void st_select_lex::print_limit(THD *thd, String *str) /* There are st_select_lex::add_table_to_list & - st_select_lex::set_lock_for_tables in sql_parse.cc + st_select_lex::set_lock_for_tables are in sql_parse.cc 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 + are in sql_union.cc */ |