bk commit into 5.0 tree (igor:1.2029)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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
  1.2029 06/02/02 23:56:08 igor@stripped +3 -0
  Fixes after manual merge

  sql/sql_select.cc
    1.393 06/02/02 23:56:02 igor@stripped +2 -2
    Fixes after manual merge

  sql/sql_prepare.cc
    1.169 06/02/02 23:56:02 igor@stripped +5 -98
    Fixes after manual merge

  mysql-test/r/having.result
    1.20 06/02/02 23:56:02 igor@stripped +0 -17
    Fixes after manual merge

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.392/sql/sql_select.cc	2006-02-02 21:23:30 -08:00
+++ 1.393/sql/sql_select.cc	2006-02-02 23:56:02 -08:00
@@ -628,7 +628,7 @@
 
   {
     Item::cond_result having_value;
-    having= optimize_cond(thd, having, &having_value);
+    having= optimize_cond(this, having, join_list, &having_value);
     if (thd->net.report_error)
     {
       error= 1;
@@ -641,7 +641,7 @@
     {						/* Impossible cond */
       DBUG_PRINT("info", (having_value == Item::COND_FALSE ? 
                             "Impossible HAVING" : "Impossible WHERE"));
-      zero_result_cause=  ?
+      zero_result_cause=  having_value == Item::COND_FALSE ?
                            "Impossible HAVING" : "Impossible WHERE";
       error= 0;
       DBUG_RETURN(0);

--- 1.19/mysql-test/r/having.result	2006-02-02 21:23:30 -08:00
+++ 1.20/mysql-test/r/having.result	2006-02-02 23:56:02 -08:00
@@ -141,23 +141,6 @@
 6
 4
 DROP TABLE t1;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 CREATE TABLE t1 (a int);
 INSERT INTO t1 VALUES (1), (2), (1), (3), (2), (1);
 SELECT a FROM t1 GROUP BY a HAVING a > 1;

--- 1.168/sql/sql_prepare.cc	2006-02-02 21:23:30 -08:00
+++ 1.169/sql/sql_prepare.cc	2006-02-02 23:56:02 -08:00
@@ -1862,96 +1862,6 @@
   {
     /* Statement map deletes statement on erase */
     thd->stmt_map.erase(stmt);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
   }
   else
     mysql_log.write(thd, COM_STMT_PREPARE, "[%lu] %s", stmt->id, packet);
@@ -2045,14 +1955,11 @@
   }
   else
   {
-    stmt->setup_set_params();
-    SELECT_LEX *sl= stmt->lex->all_selects_list;
-    for (; sl; sl= sl->next_select_in_list())
-    {
-      /*
-        during query optimisation.
-      */
-      sl->prep_where= sl->where;
+    query_str= lex->prepared_stmt_code.str;
+    *query_len= lex->prepared_stmt_code.length;
+  }
+end:
+  return query_str;
 }