diff options
| author | unknown <sunanda.menon@oracle.com> | 2013-02-05 10:50:02 +0100 |
|---|---|---|
| committer | Sunanda Menon <sunanda.menon@oracle.com> | 2013-02-05 10:50:02 +0100 |
| commit | 6f5c2debf7d31f264d2662e4ceed95bd0a5a751d (patch) | |
| tree | c9b53ee5c6cd803d3e641f236aad1d3f2c4c5ae9 | |
| parent | 34cfceac2b38e095bf03f5bed07d4eeb2949de29 (diff) | |
| parent | bfa4dbb28cde17fcf25ff0595678a09b13159e54 (diff) | |
| download | mariadb-git-6f5c2debf7d31f264d2662e4ceed95bd0a5a751d.tar.gz | |
Merge from mysql-5.5.30-release
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rw-r--r-- | mysql-test/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.bzrignore b/.bzrignore index 655cea20bc5..4012ee96751 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1313,6 +1313,7 @@ mysql-test/*.ds? mysql-test/*.vcproj mysql-test/.DS_Store mysql-test/collections/default.release +mysql-test/collections/default.release.done mysql-test/funcs_1.log mysql-test/funcs_1.tar mysql-test/gmon.out @@ -3066,4 +3067,5 @@ info_macros.cmake Docs/INFO_BIN Docs/INFO_SRC Testing +FilesCopied source_downloads diff --git a/mysql-test/CMakeLists.txt b/mysql-test/CMakeLists.txt index f360ef1c616..9c6db7082dc 100644 --- a/mysql-test/CMakeLists.txt +++ b/mysql-test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -150,8 +150,10 @@ ENDMACRO() FILE(GLOB infiles "collections/*.in") FOREACH(collin ${infiles}) STRING(REPLACE ".in" "" collection ${collin}) + STRING(REPLACE ".in" ".done" colldone ${collin}) # Only generate file once - IF(NOT EXISTS ${collection}) + IF(NOT EXISTS ${colldone}) PROCESS_COLLECTION_INCLUDE(${collin} ${collection}) + FILE(APPEND ${colldone} "${collin}\n") ENDIF() ENDFOREACH() diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 2d629c766e8..bac22fc96a9 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -370,7 +370,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/ Summary: MySQL - Shared libraries Group: Applications/Databases Provides: MySQL-shared -Conflicts: mysql-libs mysql-libs-advanced Obsoletes: MySQL-shared-standard MySQL-shared-pro Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared |