List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:October 4 2011 10:31am
Subject:bzr push into mysql-5.5 branch (joerg.bruehe:3554 to 3555)
View as plain text  
 3555 Joerg Bruehe	2011-10-04
      Exclude NDB man pages from a source tarball,
      these sources don't have any current NDB.
     @ man/CMakeLists.txt
        This will need to be modified as soon as NDB is added
        to the 5.5 sources,
        then the man page exclusion should be controlled
        by the build option also governing NDB use.

    modified:
      man/CMakeLists.txt
 3554 Joerg Bruehe	2011-09-30
      Transferring a change from main 5.5 into the 5.5.17 build:
      
      | revision-id: inaam.rana@stripped
      | parent: rohit.kalhans@stripped
      | committer: Inaam Rana <inaam.rana@stripped>
      | branch nick: mysql-5.5
      | timestamp: Fri 2011-09-30 07:02:19 -0400
      | message:
      |   Revert original fix for Bug 12612184 and the follow up fix for
      |   Bug 12704861.
      |
      |   Bug 12704861 fix was revno: 3504.1.1 (rb://693)
      |   Bug 12612184 fix was revno: 3445.1.10 (rb://678)

    modified:
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/fsp/fsp0fsp.c
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0cur.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/mtr0mtr.ic
      storage/innobase/include/page0cur.ic
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/sync0rw.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/univ.i
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/page/page0cur.c
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0undo.c
=== modified file 'man/CMakeLists.txt'
--- a/man/CMakeLists.txt	2010-11-13 22:16:52 +0000
+++ b/man/CMakeLists.txt	2011-10-04 10:28:30 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2011, 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
@@ -16,15 +16,23 @@
 # Copy man pages
 FILE(GLOB MAN1_FILES *.1)
 FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
+FILE(GLOB MAN1_NDB ndb*.1)
 FILE(GLOB MAN8_FILES *.8)
+FILE(GLOB MAN8_NDB ndb*.8)
 IF(MAN1_FILES)
   IF(MAN1_EXCLUDE)
     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
   ENDIF()
+  IF(MAN1_NDB)
+    LIST(REMOVE_ITEM MAN1_FILES ${MAN1_NDB})
+  ENDIF()
   INSTALL(FILES ${MAN1_FILES} DESTINATION ${INSTALL_MANDIR}/man1
   COMPONENT ManPages)
 ENDIF()
 IF(MAN8_FILES)
+  IF(MAN8_NDB)
+    LIST(REMOVE_ITEM MAN8_FILES ${MAN8_NDB})
+  ENDIF()
   INSTALL(FILES ${MAN8_FILES} DESTINATION ${INSTALL_MANDIR}/man8
   COMPONENT ManPages)
 ENDIF()

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (joerg.bruehe:3554 to 3555) Joerg Bruehe5 Oct