bk commit into 5.0 tree (sergefp:1.2386)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-25 02:28:53+03:00, sergefp@stripped +1 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.0-opt
  into  mysql.com:/home/psergey/mysql-5.0-bug8804-r12
  MERGE: 1.2384.1.3

  sql/mysqld.cc@stripped, 2007-01-25 02:28:49+03:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.589.1.1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	pylon.mylan
# Root:	/home/psergey/mysql-5.0-bug8804-r12/RESYNC

--- 1.590/sql/mysqld.cc	2007-01-25 02:28:59 +03:00
+++ 1.591/sql/mysqld.cc	2007-01-25 02:28:59 +03:00
@@ -453,10 +453,13 @@
 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;