From: Sergey Petrunia
Date: July 18 2006 12:58pm
Subject: bk commit into 5.1 tree (sergefp:1.2259)
List-Archive: http://lists.mysql.com/commits/9272
Message-Id: <20060718125858.DC51537B07@newbox.mylan>

Below is the list of changes that have just been committed into a local
5.1 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, 2006-07-18 16:58:52+04:00, sergefp@stripped +1 -0
  Merge spetrunia@stripped:/home/bk/mysql-5.1
  into  mysql.com:/home/psergey/mysql-5.1-bug20484
  MERGE: 1.2224.1.1

  sql/sql_select.cc@stripped, 2006-07-18 16:58:40+04:00, sergefp@stripped +0 -0
    Auto merged
    MERGE: 1.414.1.3

# 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:	newbox.mylan
# Root:	/home/psergey/mysql-5.1-bug20484/RESYNC

--- 1.422/sql/sql_select.cc	2006-07-18 16:58:58 +04:00
+++ 1.423/sql/sql_select.cc	2006-07-18 16:58:58 +04:00
@@ -14114,6 +14114,9 @@
       }
       item_list.push_back(new Item_string(table_name_buffer, len, cs));
     }
+    /* partitions */
+    if (join->thd->lex->describe & DESCRIBE_PARTITIONS)
+      item_list.push_back(item_null);
     /* type */
     item_list.push_back(new Item_string(join_type_str[JT_ALL],
 					  strlen(join_type_str[JT_ALL]),