Commit 41bb9bf9 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mdk10.(none):/home/reggie/bk/41test3
parents dcfe258f 7568579a

configure.in

+8 −8
Original line number Diff line number Diff line
@@ -501,33 +501,33 @@ PS=$ac_cv_path_PS 
# Linux style

if $PS p $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"

# Solaris

elif $PS -fp $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -p \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS -p \$\$PID | grep -v grep | grep mysqld > /dev/null"

# BSD style

elif $PS -uaxww 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

# SysV style

elif $PS -ef 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS -ef | grep mysqld | grep \" \$\$PID \" > /dev/null"

  FIND_PROC="$PS -ef | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

# Do anybody use this?

elif $PS $$ 2> /dev/null | grep $0 > /dev/null

then

  FIND_PROC="$PS \$\$PID | grep mysqld > /dev/null"

  FIND_PROC="$PS \$\$PID | grep -v grep | grep mysqld > /dev/null"

else

  case $SYSTEM_TYPE in

    *freebsd*)

      FIND_PROC="$PS p \$\$PID | grep mysqld > /dev/null"

      FIND_PROC="$PS p \$\$PID | grep -v grep | grep mysqld > /dev/null"

      ;;

    *darwin*)

      FIND_PROC="$PS -uaxww | grep mysqld | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -uaxww | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

      ;;

    *cygwin*)

      FIND_PROC="$PS -e | grep mysqld | grep \" \$\$PID \" > /dev/null"

      FIND_PROC="$PS -e | grep -v grep | grep mysqld | grep \" \$\$PID \" > /dev/null"

      ;;

    *netware* | *modesto*)

      FIND_PROC=

include/my_global.h

+0 −6
Original line number Diff line number Diff line
@@ -264,13 +264,7 @@ C_MODE_START int __cxa_pure_virtual() {\ 
# endif

#endif /* TIME_WITH_SYS_TIME */

#ifdef HAVE_UNISTD_H

#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)

#define crypt unistd_crypt

#endif

#include <unistd.h>

#ifdef HAVE_OPENSSL

#undef crypt

#endif

#endif

#if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)

#undef HAVE_ALLOCA

mysql-test/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ testdir = $(benchdir_root)/mysql-test 
EXTRA_SCRIPTS = 	mysql-test-run.sh mysql-test-run.pl install_test_db.sh

EXTRA_DIST = 		$(EXTRA_SCRIPTS) 

test_SCRIPTS = 		mysql-test-run install_test_db 

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem

test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \

	std_data/server-cert.pem std_data/server-key.pem 

CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)



INCLUDES =		-I$(srcdir)/../include -I../include -I..

mysql-test/r/create.result

+6 −0
Original line number Diff line number Diff line
@@ -580,3 +580,9 @@ ERROR 42000: Incorrect database name 'xyz' 
create table t1(t1.name int);

create table t2(test.t2.name int);

drop table t1,t2;

create database mysqltest;

use mysqltest;

drop database mysqltest;

create table test.t1 like x;

ERROR 42000: Incorrect database name 'NULL'

drop table if exists test.t1;

mysql-test/r/heap.result

+5 −0
Original line number Diff line number Diff line
@@ -291,3 +291,8 @@ a b 
1	7

1	8

drop table t1;

create table t1 (c char(255), primary key(c(90)));

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");

ERROR 23000: Duplicate entry 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl' for key 1

drop table t1;