Commit 288c2637 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/stewart/Documents/MySQL/4.1/main
parents bd197673 67d94b1c

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

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

AM_INIT_AUTOMAKE(mysql, 4.1.14)

AM_INIT_AUTOMAKE(mysql, 4.1.15)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=14

NDB_VERSION_BUILD=15

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/m_ctype.h

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

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ extern my_bool init_compiled_charsets(myf flags); 
extern void add_compiled_collation(CHARSET_INFO *cs);

extern ulong escape_string_for_mysql(CHARSET_INFO *charset_info, char *to,

                                     const char *from, ulong length);

extern char *bare_str_to_hex(char *to, const char *from, uint len);

#ifdef __WIN__

#define BACKSLASH_MBTAIL

/* File system character set */

innobase/srv/srv0start.c

+2 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,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_cases.pl

+13 −14
Original line number Diff line number Diff line
@@ -53,21 +53,20 @@ sub collect_test_cases ($) { 
  else

  {

    # ----------------------------------------------------------------------

    # Skip some tests listed in disabled.def

    # Disable some tests listed in disabled.def

    # ----------------------------------------------------------------------

    my %skiplist;

    my $skipfile= "$testdir/disabled.def";

    if ( open(SKIPFILE, $skipfile) )

    my %disabled;

    if ( open(DISABLED, "$testdir/disabled.def" ) )

    {

      while ( <SKIPFILE> )

      while ( <DISABLED> )

      {

        chomp;

        if ( /^\s*(\S+)\s*:\s*(.*?)\s*$/ )

        {

          $skiplist{$1}= $2;

          $disabled{$1}= $2;

        }

      }

      close SKIPFILE;

      close DISABLED;

    }



    foreach my $elem ( sort readdir(TESTDIR) ) {
@@ -75,7 +74,7 @@ sub collect_test_cases ($) { 
      next if ! defined $tname;

      next if $::opt_do_test and ! defined mtr_match_prefix($elem,$::opt_do_test);



      collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,\%skiplist);

      collect_one_test_case($testdir,$resdir,$tname,$elem,$cases,\%disabled);

    }

    closedir TESTDIR;

  }
@@ -119,7 +118,7 @@ sub collect_one_test_case($$$$$$) { 
  my $tname=   shift;

  my $elem=    shift;

  my $cases=   shift;

  my $skiplist=shift;

  my $disabled=shift;



  my $path= "$testdir/$elem";
@@ -188,7 +187,7 @@ sub collect_one_test_case($$$$$$) { 
  my $slave_mi_file=   "$testdir/$tname.slave-mi";

  my $master_sh=       "$testdir/$tname-master.sh";

  my $slave_sh=        "$testdir/$tname-slave.sh";

  my $disabled=        "$testdir/$tname.disabled";

  my $disabled_file=   "$testdir/$tname.disabled";



  $tinfo->{'master_opt'}= $::glob_win32 ? ["--default-time-zone=+3:00"] : [];

  $tinfo->{'slave_opt'}=  $::glob_win32 ? ["--default-time-zone=+3:00"] : [];
@@ -292,18 +291,18 @@ sub collect_one_test_case($$$$$$) { 
  }



  # FIXME why this late?

  if ( $skiplist->{$tname} )

  if ( $disabled->{$tname} )

  {

    $tinfo->{'skip'}= 1;

    $tinfo->{'disable'}= 1;   # Sub type of 'skip'

    $tinfo->{'comment'}= $skiplist->{$tname} if $skiplist->{$tname};

    $tinfo->{'comment'}= $disabled->{$tname} if $disabled->{$tname};

  }



  if ( -f $disabled )

  if ( -f $disabled_file )

  {

    $tinfo->{'skip'}= 1;

    $tinfo->{'disable'}= 1;   # Sub type of 'skip'

    $tinfo->{'comment'}= mtr_fromfile($disabled);

    $tinfo->{'comment'}= mtr_fromfile($disabled_file);

  }



  # We can't restart a running server that may be in use