From: Tor Didriksen
Date: December 20 2010 1:03pm
Subject: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3450)
List-Archive: http://lists.mysql.com/commits/127299
Message-Id: <20101220130301.A5FA0341E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///export/home/didrik/repo/trunk-bugfixing/ based on revid:bar@stripped

 3450 Tor Didriksen	2010-12-20 [merge]
      Merge 5.5-bugteam => trunk-bugfixing
      
      text conflict: include/CMakeLists.txt

    modified:
      include/CMakeLists.txt
      scripts/mysql_config.sh
      sql/sql_select.cc
      support-files/CMakeLists.txt
=== modified file 'include/CMakeLists.txt'
--- a/include/CMakeLists.txt	2010-09-27 13:20:24 +0000
+++ b/include/CMakeLists.txt	2010-12-20 13:02:34 +0000
@@ -59,7 +59,7 @@ SET(HEADERS 
 )
 
 INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}  COMPONENT Development 
+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
  PATTERN "*.h"
  PATTERN "psi_abi*" EXCLUDE
 )

=== modified file 'scripts/mysql_config.sh'
--- a/scripts/mysql_config.sh	2010-08-09 13:27:04 +0000
+++ b/scripts/mysql_config.sh	2010-12-17 23:13:33 +0000
@@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e 
 fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
 
 pkgincludedir='@pkgincludedir@'
-fix_path pkgincludedir include/mysql include
+if [ -f "$basedir/include/mysql/mysql.h" ]; then
+  pkgincludedir="$basedir/include/mysql"
+elif [ -f "$basedir/include/mysql.h" ]; then
+  pkgincludedir="$basedir/include"
+fi
 
 version='@VERSION@'
 socket='@MYSQL_UNIX_ADDR@'

=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc	2010-12-17 12:58:04 +0000
+++ b/sql/sql_select.cc	2010-12-20 13:02:34 +0000
@@ -15773,6 +15773,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARA
 	 (ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT1 ||
 	 (ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT2) ?
 	0 : FIELDFLAG_BINARY;
+      key_part_info->key_part_flag= 0;
       if (!using_unique_constraint)
       {
 	cur_group->buff=(char*) group_buff;

=== modified file 'support-files/CMakeLists.txt'
--- a/support-files/CMakeLists.txt	2010-11-19 13:56:08 +0000
+++ b/support-files/CMakeLists.txt	2010-12-17 23:03:23 +0000
@@ -48,14 +48,7 @@ FOREACH(inifile my-huge my-innodb-heavy-
 ENDFOREACH()
 
 IF(UNIX)
-  # XXX: again, used elsewhere (scripts/), should be standardised in
-  # XXX: install_layout.cmake
-  IF(INSTALL_LAYOUT MATCHES "STANDALONE")
-    SET(prefix ".")
-  ELSE()
-    SET(prefix ${CMAKE_INSTALL_PREFIX})
-  ENDIF()
- 
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).