List:Commits« Previous MessageNext Message »
From:mhansson Date:May 31 2007 12:27pm
Subject:bk commit into 5.1 tree (mhansson:1.2520)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of mhansson. When mhansson 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-05-31 14:27:02+02:00, mhansson@stripped +2 -0
  Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my50-bug27741
  into  dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my51-bug27741
  MERGE: 1.1810.2913.10

  mysql-test/mysql-test-run.pl@stripped, 2007-05-31 14:26:57+02:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.30.49.76

  sql/udf_example.c@stripped, 2007-05-31 14:26:57+02:00, mhansson@stripped +0 -0
    Auto merged
    MERGE: 1.29.1.6

# 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:	mhansson
# Host:	dl145s.mysql.com
# Root:	/users/mhansson/mysql/push/bug27741/my51-bug27741/RESYNC

--- 1.36/sql/udf_example.c	2007-02-23 21:48:12 +01:00
+++ 1.37/sql/udf_example.c	2007-05-31 14:26:57 +02:00
@@ -130,7 +130,8 @@ typedef long long longlong;
 #include <m_string.h>		/* To get strmov() */
 #else
 /* when compiled as standalone */
-#define strmov(a,b) strcpy(a,b)
+#include <string.h>
+#define strmov(a,b) stpcpy(a,b)
 #define bzero(a,b) memset(a,0,b)
 #define memcpy_fixed(a,b,c) memcpy(a,b,c)
 #endif

--- 1.303/mysql-test/mysql-test-run.pl	2007-05-07 21:32:02 +02:00
+++ 1.304/mysql-test/mysql-test-run.pl	2007-05-31 14:26:57 +02:00
@@ -1812,6 +1812,17 @@ sub environment_setup () {
 				  split(':', $ENV{'DYLD_LIBRARY_PATH'}) : ());
   mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}");
 
+  # The environment variable used for shared libs on AIX
+  $ENV{'SHLIB_PATH'}= join(":", @ld_library_paths,
+                           $ENV{'SHLIB_PATH'} ?
+                           split(':', $ENV{'SHLIB_PATH'}) : ());
+  mtr_debug("SHLIB_PATH: $ENV{'SHLIB_PATH'}");
+
+  # The environment variable used for shared libs on hp-ux
+  $ENV{'LIBPATH'}= join(":", @ld_library_paths,
+                        $ENV{'LIBPATH'} ?
+                        split(':', $ENV{'LIBPATH'}) : ());
+  mtr_debug("LIBPATH: $ENV{'LIBPATH'}");
 
   # --------------------------------------------------------------------------
   # Also command lines in .opt files may contain env vars
Thread
bk commit into 5.1 tree (mhansson:1.2520)mhansson31 May