diff options
author | unknown <konstantin@mysql.com> | 2004-08-24 23:07:08 +0400 |
---|---|---|
committer | unknown <konstantin@mysql.com> | 2004-08-24 23:07:08 +0400 |
commit | 205cf8044b1c6e94b7e92a44bd4eb342393f5a6f (patch) | |
tree | 27afa0ffb4411fa21754ed6f1be2820f7eb7784f /sql/sql_lex.cc | |
parent | 6b20f46abc65f8b3dd851df71d04b89cb0d3f208 (diff) | |
parent | 49bd559eb8f041de97e4ef55f280f3806d1b6c42 (diff) | |
download | mariadb-git-205cf8044b1c6e94b7e92a44bd4eb342393f5a6f.tar.gz |
Merge: manual resolve
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_class.cc:
Manual resolve of the merge
Diffstat (limited to 'sql/sql_lex.cc')
-rw-r--r-- | sql/sql_lex.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index ccbc015533b..fab047002ad 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -1653,6 +1653,11 @@ void st_select_lex::print_limit(THD *thd, String *str) } +st_lex::st_lex() + :result(0) +{} + + /* Unlink first table from global table list and first table from outer select list (lex->select_lex) |