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/mysqld.cc | |
| 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/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bcf5263d06c..85a9fd3218a 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -524,10 +524,13 @@ char *mysqld_unix_port, *opt_mysql_tmpdir; const char **errmesg; /* Error messages */ const char *myisam_recover_options_str="OFF"; const char *myisam_stats_method_str="nulls_unequal"; + /* name of reference on left espression in rewritten IN subquery */ const char *in_left_expr_name= "<left expr>"; /* name of additional condition */ const char *in_additional_cond= "<IN COND>"; +const char *in_having_cond= "<IN HAVING>"; + my_decimal decimal_zero; /* classes for comparation parsing/processing */ Eq_creator eq_creator; |