database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge from mysql-5.5.30-release

Browse Source
This commit is contained in:
sunanda.menon@oracle.com
2013-02-05 10:50:02 +01:00
committed by Sunanda Menon
parent 9936f0ce6f 227699bc38
commit ddb8c77ec4
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.bzrignore
View File

@@ -1313,6 +1313,7 @@ mysql-test/*.ds?
mysql-test/*.vcproj mysql-test/*.vcproj
mysql-test/.DS_Store mysql-test/.DS_Store
mysql-test/collections/default.release mysql-test/collections/default.release
mysql-test/collections/default.release.done
mysql-test/funcs_1.log mysql-test/funcs_1.log
mysql-test/funcs_1.tar mysql-test/funcs_1.tar
mysql-test/gmon.out mysql-test/gmon.out
@@ -3066,4 +3067,5 @@ info_macros.cmake
Docs/INFO_BIN Docs/INFO_BIN
Docs/INFO_SRC Docs/INFO_SRC
Testing Testing
FilesCopied
source_downloads source_downloads

6
mysql-test/CMakeLists.txt
View File

@@ -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 # 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 # it under the terms of the GNU General Public License as published by
@@ -150,8 +150,10 @@ ENDMACRO()
FILE(GLOB infiles "collections/*.in") FILE(GLOB infiles "collections/*.in")
FOREACH(collin ${infiles}) FOREACH(collin ${infiles})
STRING(REPLACE ".in" "" collection ${collin}) STRING(REPLACE ".in" "" collection ${collin})
STRING(REPLACE ".in" ".done" colldone ${collin})
# Only generate file once # Only generate file once
IF(NOT EXISTS ${collection}) IF(NOT EXISTS ${colldone})
PROCESS_COLLECTION_INCLUDE(${collin} ${collection}) PROCESS_COLLECTION_INCLUDE(${collin} ${collection})
FILE(APPEND ${colldone} "${collin}\n")
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()

1
support-files/mysql.spec.sh
View File

@@ -370,7 +370,6 @@ For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
Summary: MySQL - Shared libraries Summary: MySQL - Shared libraries
Group: Applications/Databases Group: Applications/Databases
Provides: MySQL-shared Provides: MySQL-shared
Conflicts: mysql-libs mysql-libs-advanced
Obsoletes: MySQL-shared-standard MySQL-shared-pro Obsoletes: MySQL-shared-standard MySQL-shared-pro
Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl Obsoletes: MySQL-shared-pro-cert MySQL-shared-pro-gpl
Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared Obsoletes: MySQL-shared-pro-gpl-cert MySQL-shared