bzr push into mysql-5.5 branch (joerg:3080 to 3081) Bug#56267

[Joerg Bruehe]

 3081 Joerg Bruehe	2010-09-30
      Part of the fix for bug#56267: Set a proper installation directory.

    modified:
      scripts/CMakeLists.txt
 3080 Joerg Bruehe	2010-09-27 [merge]
      Automerge some stuff from main 5.5, so that PB2 will pick up this branch.

    added:
      mysql-test/suite/binlog/r/binlog_mixed_load_data.result
      mysql-test/suite/binlog/t/binlog_mixed_load_data.test
      mysql-test/t/ssl_8k_key-master.opt
    modified:
      README
      extra/yassl/taocrypt/src/coding.cpp
      include/myisam.h
      mysql-test/collections/default.experimental
      mysql-test/r/group_by.result
      mysql-test/r/insert.result
      mysql-test/r/mysql_client_test.result
      mysql-test/r/partition_range.result
      mysql-test/r/range.result
      mysql-test/r/subselect4.result
      mysql-test/std_data/server8k-cert.pem
      mysql-test/std_data/server8k-key.pem
      mysql-test/suite/binlog/t/binlog_killed_simulate.test
      mysql-test/suite/binlog/t/binlog_stm_blackhole.test
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_loaddata.test
      mysql-test/suite/rpl/t/rpl_loaddata_fatal.test
      mysql-test/suite/rpl/t/rpl_loaddata_map.test
      mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
      mysql-test/suite/rpl/t/rpl_stm_log.test
      mysql-test/t/disabled.def
      mysql-test/t/group_by.test
      mysql-test/t/insert.test
      mysql-test/t/mysql_client_test.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/partition_range.test
      mysql-test/t/range.test
      mysql-test/t/subselect4.test
      mysys/my_getopt.c
      mysys/stacktrace.c
      sql/events.cc
      sql/events.h
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/mysqld.cc
      sql/mysqld.h
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_load.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_update.cc
      sql/sys_vars.h
      storage/myisam/mi_static.c
      support-files/my-innodb-heavy-4G.cnf.sh
      tests/mysql_client_test.c
=== modified file 'scripts/CMakeLists.txt'
--- a/scripts/CMakeLists.txt	2010-08-12 15:19:57 +0000
+++ b/scripts/CMakeLists.txt	2010-09-30 15:44:57 +0000
@@ -86,7 +86,7 @@ IF($ENV{MALLOC_LIB})
 ENDIF()
 
 IF(MALLOC_LIB)
-  INSTALL(FILES ${MALLOC_LIB} DESTINATION lib OPTIONAL)
+  INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
 ENDIF()
 
 IF(CMAKE_GENERATOR MATCHES "Makefiles")


Attachment: [text/bzr-bundle] bzr/[e-mail]