List:Commits« Previous MessageNext Message »
From:Joerg Bruehe Date:November 10 2006 2:01pm
Subject:bk commit into 5.1 tree (joerg:1.2346)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 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, 2006-11-10 15:01:21+01:00, joerg@trift2. +1 -0
  Merge trift2.:/MySQL/M50/bug24023-5.0
  into  trift2.:/MySQL/M51/push-5.1
  MERGE: 1.1810.2280.2

  BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838@stripped, 2006-11-10 15:01:15+01:00, joerg@trift2. +0 -0
    Auto merged
    MERGE: 1.2.2.2

# 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/M51/push-5.1/RESYNC

--- 1.6/BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838	2006-11-10 15:01:30 +01:00
+++ 1.7/BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838	2006-11-10 15:01:30 +01:00
@@ -4,4 +4,7 @@
  */
 #if 0
 extern "C" { int __cxa_pure_virtual() { return 0;} }
+#else
+/* Some compiler/linker combinations fail on files without exported symbols. */
+extern "C" { int dummy_export_symbol() { return 0;} }
 #endif
Thread
bk commit into 5.1 tree (joerg:1.2346)Joerg Bruehe10 Nov