List:Commits« Previous MessageNext Message »
From:monty Date:January 10 2006 4:03pm
Subject:bk commit into 4.1 tree (monty:1.2475)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of monty. When monty 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.2475 06/01/10 18:03:54 monty@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-4.1
  into  mysql.com:/home/my/mysql-4.1

  sql/sql_select.cc
    1.446 06/01/10 18:03:51 monty@stripped +0 -0
    Auto merged

# 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:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-4.1/RESYNC

--- 1.445/sql/sql_select.cc	2006-01-08 08:59:56 +02:00
+++ 1.446/sql/sql_select.cc	2006-01-10 18:03:51 +02:00
@@ -5292,7 +5292,14 @@
       *(reg_field++) =new_field;
     }
     if (!--hidden_field_count)
+    {
       hidden_null_count=null_count;
+      /*
+        We need to update hidden_field_count as we may have stored group
+        functions with constant arguments
+      */
+      param->hidden_field_count= (uint) (reg_field - table->field);
+    }
   }
   DBUG_ASSERT(field_count >= (uint) (reg_field - table->field));
   field_count= (uint) (reg_field - table->field);
@@ -5488,7 +5495,7 @@
     }
   }
 
-  if (distinct)
+  if (distinct && field_count != param->hidden_field_count)
   {
     /*
       Create an unique key or an unique constraint over all columns
Thread
bk commit into 4.1 tree (monty:1.2475)monty10 Jan