diff options
| author | unknown <sergefp@pylon.mylan> | 2007-01-24 22:28:28 +0300 |
|---|---|---|
| committer | unknown <sergefp@pylon.mylan> | 2007-01-24 22:28:28 +0300 |
| commit | 713bb7a09e8ff3791ad58b35a3606dad7d633bfb (patch) | |
| tree | 23a9bb9298eca91871ea06a5a24ed32d0cc66c3a /sql/mysql_priv.h | |
| parent | 4ee9e407d456462f8a80ab27bc8d6bc95e7cfc14 (diff) | |
| parent | 130523af45fed617e44d454e3901cf5a560ccd90 (diff) | |
| download | mariadb-git-713bb7a09e8ff3791ad58b35a3606dad7d633bfb.tar.gz | |
Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12
into mysql.com:/home/psergey/mysql-5.1-bug8804-r12-merge
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
mysql-test/r/ndb_subquery.result:
Manual merge
mysql-test/r/subselect.result:
Manual merge
mysql-test/r/subselect3.result:
Manual merge
sql/item_subselect.cc:
Manual merge
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 56a7403b372..742efc71e63 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1532,7 +1532,7 @@ extern const LEX_STRING command_name[]; extern const char *first_keyword, *my_localhost, *delayed_user, *binary_keyword; extern const char **errmesg; /* Error messages */ extern const char *myisam_recover_options_str; -extern const char *in_left_expr_name, *in_additional_cond; +extern const char *in_left_expr_name, *in_additional_cond, *in_having_cond; extern const char * const triggers_file_ext; extern const char * const trigname_file_ext; extern Eq_creator eq_creator; |