Commit fa0b07d8 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
parents 2a29fbfc b8d4b15c

client/mysql.cc

+0 −1
Original line number Diff line number Diff line
@@ -2346,7 +2346,6 @@ print_table_data(MYSQL_RES *result) 
      uint visible_length;

      uint extra_padding;



      /* If this column may have a null value, use "NULL" for empty.  */

      if (! not_null_flag[off] && (cur[off] == NULL))

      {

        buffer= "NULL";

configure.in

+4 −23
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ dnl Is this the right match for DEC OSF on alpha? 
    # Edit Makefile.in files.

    #

    echo -n "configuring Makefile.in files for NetWare... "

    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in sql/share/Makefile.in strings/Makefile.in client/Makefile.in

    for file in sql/Makefile.in extra/Makefile.in client/Makefile.in

    do

    # echo "#### $file ####"

      filedir="`dirname $file`"
@@ -1109,32 +1109,13 @@ dnl Is this the right match for DEC OSF on alpha? 
          # Add library dependencies to mysqld_DEPENDENCIES

          lib_DEPENDENCIES="\$(pstack_libs) \$(openssl_libs) \$(yassl_libs)"

          cat > $filesed << EOF

s,\(^.*\$(MAKE) gen_lex_hash\)\$(EXEEXT),#\1,

s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,

s%\(mysqld_DEPENDENCIES = \)%\1$lib_DEPENDENCIES %

EOF

          ;;

        sql/share/Makefile.in)

        extra/Makefile.in)

          cat > $filesed << EOF

s,\(extra/comp_err\),\1.linux,

EOF

          ;;

        libmysql/Makefile.in)

          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

EOF

          ;;

        libmysql_r/Makefile.in)

          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

EOF

          ;;

        strings/Makefile.in)

          cat > $filesed << EOF

s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,

s,\(: conf_to_src\),\1.linux,

s,\(extra/comp_err\)\$(EXEEXT),\1.linux,

EOF

          ;;

        client/Makefile.in)

mysql-test/valgrind.supp

+20 −0
Original line number Diff line number Diff line
@@ -111,6 +111,26 @@ 
   obj:/lib/ld-*.so

}



{

   pthread strstr uninit

   Memcheck:Cond

   fun:strstr

   obj:/lib/tls/libpthread.so.*

   obj:/lib/tls/libpthread.so.*

   fun:call_init

   fun:_dl_init

   obj:/lib/ld-*.so

}



{  

   strlen/_dl_init_paths/dl_main/_dl_sysdep_start(Cond)

   Memcheck:Cond

   fun:strlen

   fun:_dl_init_paths

   fun:dl_main

   fun:_dl_sysdep_start

}



{

   pthread errno

   Memcheck:Leak

sql/net_serv.cc

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ 
#include <signal.h>

#include <errno.h>



#ifdef __NETWARE__

#include <sys/select.h>

#endif



#ifdef EMBEDDED_LIBRARY

#undef MYSQL_SERVER

#undef MYSQL_CLIENT

storage/csv/ha_tina.cc

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,11 @@ static byte* tina_get_key(TINA_SHARE *share,uint *length, 
int get_mmap(TINA_SHARE *share, int write)

{

  DBUG_ENTER("ha_tina::get_mmap");

#ifdef __NETWARE__

  my_message(errno, "Sorry, no mmap() on Netware", 0);

  DBUG_ASSERT(0);

  DBUG_RETURN(1);

#else

  if (share->mapped_file && my_munmap(share->mapped_file,

                                      share->file_stat.st_size))

    DBUG_RETURN(1);
@@ -180,6 +185,7 @@ int get_mmap(TINA_SHARE *share, int write) 
    share->mapped_file= NULL;



  DBUG_RETURN(0);

#endif /* __NETWARE__ */

}