Commit ed2a5419 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents abbb5220 06cafbba

Docs/manual.texi

+540 −738

File changed.

Preview size limit exceeded, changes collapsed.

myisam/Makefile.am

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ noinst_HEADERS = myisamdef.h fulltext.h ftdefs.h ft_test1.h ft_eval.h 
mi_test1_DEPENDENCIES=	$(LIBRARIES)

mi_test2_DEPENDENCIES=	$(LIBRARIES)

mi_test3_DEPENDENCIES=	$(LIBRARIES)

ft_test1_DEPENDENCIES=	$(LIBRARIES)

ft_eval_DEPENDENCIES=	$(LIBRARIES)

ft_dump_DEPENDENCIES=	$(LIBRARIES)

#ft_test1_DEPENDENCIES=	$(LIBRARIES)

#ft_eval_DEPENDENCIES=	$(LIBRARIES)

#ft_dump_DEPENDENCIES=	$(LIBRARIES)

libmyisam_a_SOURCES =	mi_open.c mi_extra.c mi_info.c mi_rkey.c \

			mi_rnext.c mi_rnext_same.c \

			mi_search.c mi_page.c mi_key.c mi_locking.c \

scripts/mysqld_safe.sh

+41 −8
Original line number Diff line number Diff line
@@ -159,14 +159,47 @@ export MYSQL_TCP_PORT 




NOHUP_NICENESS="nohup"

if test -w /



# Using nice with no args to get the niceness level is GNU-specific.

# This check could be extended for other operating systems (e.g.,

# BSD could use "nohup sh -c 'ps -o nice -p $$' | tail -1").

# But, it also seems that GNU nohup is the only one which messes

# with the priority, so this is okay.

if nohup nice > /dev/null 2>&1

then

  NOHUP_NICENESS=`nohup nice 2>&1`

 if test $? -eq 0 && test x"$NOHUP_NICENESS" != x0 && nice --1 echo foo > /dev/null 2>&1

    normal_niceness=`nice`

    nohup_niceness=`nohup nice`



    numeric_nice_values=1

    for val in $normal_niceness $nohup_niceness

    do

        case "$val" in

            -[0-9] | -[0-9][0-9] | -[0-9][0-9][0-9] | \

             [0-9] |  [0-9][0-9] |  [0-9][0-9][0-9] )

                ;;

            * )

                numeric_nice_values=0 ;;

        esac

    done



    if test $numeric_nice_values -eq 1

    then

        nice_value_diff=`expr $nohup_niceness - $normal_niceness`

        if test $? -eq 0 && test $nice_value_diff -gt 0 && \

            nice --$nice_value_diff echo testing > /dev/null 2>&1

        then

    NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"

            # nohup increases the priority (bad), and we are permitted

            # to lower the priority

            NOHUP_NICENESS="nice --$nice_value_diff nohup"

        fi

    fi

else

    NOHUP_NICENESS="nohup"

    if nohup echo testing > /dev/null 2>&1

    then

        :

    else

        # nohup doesn't work on this system

        NOHUP_NICENESS=""

    fi

fi