diff options
| author | unknown <gluh@eagle.(none)> | 2007-01-26 16:46:01 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-01-26 16:46:01 +0400 |
| commit | 33b73c200f57d50cf6502cfdf48d860f01ae83b2 (patch) | |
| tree | 0d0331efb0feab8a0b10a3440ef0861ee20d3e0e /sql/mysqld.cc | |
| parent | 8b2d01336415c59f7d1912a6f36adf194955a986 (diff) | |
| parent | 4d7994ad683b06ee08f30c2efb34b8dcb297ad97 (diff) | |
| download | mariadb-git-33b73c200f57d50cf6502cfdf48d860f01ae83b2.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1
mysql-test/r/view.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
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 6114c5da0cd..6375bb51220 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; |