Commit e9c420cc authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1 

into  mysql.com:/home/emurphy/src/work/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysys/charset.c:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
sql/item.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-euc_kr.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
strings/ctype-gb2312.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-ujis.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
configure.in:
  Manual merge from 4.1
include/config-netware.h:
  Manual merge from 4.1
sql/item.cc:
  Manual merge from 4.1
sql/mysqld.cc:
  Manual merge from 4.1
parents 141a36c3 1b970e94

configure.in

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ AC_PREREQ(2.52)dnl Minimum Autoconf version required. 


AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# Don't forget to also update the NDB lines below.

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.12-beta)

AM_CONFIG_HEADER(config.h)

include/config-netware.h

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ extern "C" { 
#define HAVE_PTHREAD_YIELD_ZERO_ARG 1

#define HAVE_BROKEN_REALPATH 1



/* changes made to make use of LibC-June-2004 for building purpose */

#undef HAVE_POSIX_SIGNALS

#undef HAVE_PTHREAD_ATTR_SETSCOPE

#undef HAVE_ALLOC_A
@@ -62,6 +63,8 @@ extern "C" { 
#undef HAVE_PTHREAD_SETSCHEDPARAM

#undef HAVE_READLINK

#undef HAVE_STPCPY

/* changes  end  */



/* no libc crypt() function */

#ifdef HAVE_OPENSSL

  #define HAVE_CRYPT 1

include/m_ctype.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ typedef struct charset_info_st 
  uint      mbmaxlen;

  uint16    min_sort_char;

  uint16    max_sort_char; /* For LIKE optimization */

  my_bool   escape_with_backslash_is_dangerous;

  

  MY_CHARSET_HANDLER *cset;

  MY_COLLATION_HANDLER *coll;

innobase/srv/srv0start.c

+2 −1
Original line number Diff line number Diff line
@@ -1054,7 +1054,8 @@ innobase_start_or_create_for_mysql(void) 


	        fprintf(stderr,

"InnoDB: Error: You have specified innodb_buffer_pool_awe_mem_mb\n"

"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.\n");

"InnoDB: in my.cnf, but AWE can only be used in Windows 2000 and later.\n"

"InnoDB: To use AWE, InnoDB must be compiled with __WIN2000__ defined.\n");



	        return(DB_ERROR);

	}

mysql-test/lib/mtr_misc.pl

+9 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
use strict;



sub mtr_full_hostname ();

sub mtr_short_hostname ();

sub mtr_init_args ($);

sub mtr_add_arg ($$);

sub mtr_path_exists(@);
@@ -21,6 +22,7 @@ sub mtr_exe_exists(@); 


# We want the fully qualified host name and hostname() may have returned

# only the short name. So we use the resolver to find out.

# Note that this might fail on some platforms



sub mtr_full_hostname () {
@@ -35,6 +37,13 @@ sub mtr_full_hostname () { 
  return $hostname;

}



sub mtr_short_hostname () {



  my $hostname=  hostname();

  $hostname =~ s/\..+$//;

  return $hostname;

}



# FIXME move to own lib



sub mtr_init_args ($) {