Commit d9fcc304 authored by mhansson@dl145s.mysql.com's avatar mhansson@dl145s.mysql.com
Browse files

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  dl145s.mysql.com:/dev/shm/mhansson/my50-bug27741
parents 44b46b73 3ee16518

mysql-test/mysql-test-run.pl

+11 −0
Original line number Diff line number Diff line
@@ -1784,6 +1784,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

sql/udf_example.c

+2 −1
Original line number Diff line number Diff line
@@ -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