Commit 2afc0b1e authored by unknown's avatar unknown
Browse files

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

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
parents 0af7dd0c 75108949

configure.in

+8 −8
Original line number Diff line number Diff line
@@ -443,33 +443,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*)

      FIND_PROC=

extra/yassl/taocrypt/include/types.hpp

+3 −2
Original line number Diff line number Diff line
@@ -68,8 +68,9 @@ typedef unsigned int word32; 


// TODO: FIXME, add asm multiply for x86_64 on Solaris and remove !__sun 

    

#if defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \

    defined(__mips64)  || (defined(__x86_64__) && !defined(__sun))

#if defined(__alpha__) || (defined(__ia64__) && !defined(__INTEL_COMPILER)) || \

    defined(_ARCH_PPC64) || defined(__mips64)  || \

    (defined(__x86_64__) && !defined(__sun))

// These platforms have 64-bit CPU registers. Unfortunately most C++ compilers

// don't allow any way to access the 64-bit by 64-bit multiply instruction

// without using assembly, so in order to use word64 as word, the assembly

include/my_global.h

+0 −6
Original line number Diff line number Diff line
@@ -285,13 +285,7 @@ C_MODE_END 
# endif

#endif /* TIME_WITH_SYS_TIME */

#ifdef HAVE_UNISTD_H

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

#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/r/analyze.result

0 → 100644
+32 −0
Original line number Diff line number Diff line 
create table t1 (a bigint);

lock tables t1 write;

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

lock tables t1 write;

delete from t1;

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

unlock tables;

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

create table t1 (a bigint);

insert into t1 values(0);

analyze table t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

mysql-test/r/create.result

+6 −0
Original line number Diff line number Diff line
@@ -596,3 +596,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;