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

 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
 3449 Alexander Barkov	2010-12-20
        WL#5624 Collation customization improvements
        
          @ include/m_ctype.h
            - Extending MY_UCA_MAX_CONTRACTION to 6
            - Adding "with_context" indicator
            - Adding logical positions
            - Introducing new MY_CHARSET_LOADER type, a combination
              of error message, memory management functions,
              warning reporter routine and collation adding routine.
            - Changing parameters to initialization functions to
              use MY_CHARSET_LOADER
        
          @ include/my_getopt.h
            Moving type definition to my_sys.h, to share in charset related code.
        
          @ include/my_global.h
            Adding enum loglevel definition, to share in /strings
        
          @ include/my_sys.h
            Moving enum loglevel definition to my_global.h
        
          @ mysql-test/r/ctype_ldml.result
          @ mysql-test/std_data/Index.xml
          @ mysql-test/t/ctype_ldml.test
            Adding tests
        
          @ mysys/charset.c
            Adding my_charset_get_by_name() and my_collation_get_by_name() - 
            extended versions of get_charset_by_name() and get_get_charset_by_csname,
            to return error message to the caller.
        
          @ sql/item_strfunc.cc
            Using new function mysqld_collation_get_by_name()
        
          @ sql/mysqld.cc
            More verbosity at mysqld startup - collation warnings are now displayed.
        
          @ sql/sql_class.h
            Adding new function mysqld_collation_get_by_name(),
            to get collation and to report error to client on failure.
        
          @ sql/sql_yacc.yy
            Using new function mysqld_collation_get_by_name()
        
          @ sql/sys_vars.cc
            Using new function mysqld_collation_get_by_name()
        
          @ strings/CMakeLists.txt
            Adding coft_to_src to Makefile as an optional binary
            (was missed during autotools to cmake transition)
        
          @ strings/conf_to_src.c
            Adding "libc" initializer to MY_CHARSET_LOADER.
            Changing parameters to use MY_CHARSET_LOADER.
        
          @ strings/ctype-bin.c
            Changing parameters to use MY_CHARSET_LOADER.
        
          @ strings/ctype-simple.c
            Changing parameters to use MY_CHARSET_LOADER.
        
          @ strings/ctype-uca.c
            Adding support for WL#5624 features.
            Collation customization parser now works in look-ahead(1) mode.
        
          @ strings/ctype.c
            Adding new LDML tags.

    modified:
      include/m_ctype.h
      include/my_getopt.h
      include/my_global.h
      include/my_sys.h
      mysql-test/r/ctype_ldml.result
      mysql-test/std_data/Index.xml
      mysql-test/t/ctype_ldml.test
      mysys/charset.c
      sql/item_strfunc.cc
      sql/mysqld.cc
      sql/sql_class.h
      sql/sql_yacc.yy
      strings/CMakeLists.txt
      strings/conf_to_src.c
      strings/ctype-bin.c
      strings/ctype-simple.c
      strings/ctype-uca.c
      strings/ctype.c
=== 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: useless for push emails).