List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:January 25 2007 4:41pm
Subject:bk commit into 5.0 tree (joerg:1.2386) BUG#12676
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-25 16:41:21+01:00, joerg@trift2. +2 -0
  Fixes to get "support-files/RHEL4-SElinux/Makefile" created. bug#12676

  configure.in@stripped, 2007-01-25 16:41:17+01:00, joerg@trift2. +2 -1
    Missing change to get "support-files/RHEL4-SElinux/Makefile" created ?

  support-files/RHEL4-SElinux/Makefile.am@stripped, 2007-01-25 16:41:17+01:00, joerg@trift2. +2 -0
    Missing change ?

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/MySQL/M50/bug12676-5.0

--- 1.419/configure.in	2007-01-25 16:41:29 +01:00
+++ 1.420/configure.in	2007-01-25 16:41:29 +01:00
@@ -2860,7 +2860,8 @@
  include/Makefile sql-bench/Makefile dnl
  server-tools/Makefile server-tools/instance-manager/Makefile dnl
  tests/Makefile Docs/Makefile support-files/Makefile dnl
- support-files/MacOSX/Makefile mysql-test/Makefile dnl
+ support-files/MacOSX/Makefile support-files/RHEL4-SElinux/Makefile dnl
+ mysql-test/Makefile dnl
  netware/Makefile dnl
  include/mysql_version.h dnl
  cmd-line-utils/Makefile dnl

--- 1.1/support-files/RHEL4-SElinux/Makefile.am	2007-01-25 16:41:29 +01:00
+++ 1.2/support-files/RHEL4-SElinux/Makefile.am	2007-01-25 16:41:29 +01:00
@@ -19,3 +19,5 @@
 
 EXTRA_DIST =		mysql.fc mysql.te
 
+# Don't update the files from bitkeeper
+%::SCCS/s.%
Thread
bk commit into 5.0 tree (joerg:1.2386) BUG#12676Joerg Bruehe25 Jan