Merge 5.5-bugteam => trunk-bugfixing

Tor Didriksen · Tor Didriksen · commit 95358ea08b30 · 2010-12-20T14:02:34.000+01:00
text conflict: include/CMakeLists.txt
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -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
 )
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
@@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
 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@'
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
@@ -15773,6 +15773,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 	 (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;
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
@@ -48,14 +48,7 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
 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 

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ SET(HEADERS`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)`
`62`		`-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development`
	`62`	`+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development`
`63`	`63`	`PATTERN "*.h"`
`64`	`64`	`PATTERN "psi_abi*" EXCLUDE`
`65`	`65`	`)`
Original file line number	Diff line number	Diff line change
`@@ -15773,6 +15773,7 @@ create_tmp_table(THD thd,TMP_TABLE_PARAM param,List<Item> &fields,`
`15773`	`15773`	`(ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT1 \|\|`
`15774`	`15774`	`(ha_base_keytype) key_part_info->type == HA_KEYTYPE_VARTEXT2) ?`
`15775`	`15775`	`0 : FIELDFLAG_BINARY;`
	`15776`	`+ key_part_info->key_part_flag= 0;`
`15776`	`15777`	`if (!using_unique_constraint)`
`15777`	`15778`	`{`
`15778`	`15779`	`cur_group->buff=(char*) group_buff;`