Commit cb8b1cf3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-8355 

into mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_base.cc:
  Auto merged
parents de8a4f80 b1c42daa

BitKeeper/etc/logging_ok

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ brian@private-client-ip-101.oz.net 
brian@zim.(none)

carsten@tsort.bitbybit.dk

davida@isil.mysql.com

dean@mysql.com

dellis@goetia.(none)

dlenev@brandersnatch.localdomain

dlenev@build.mysql.com
@@ -203,6 +204,7 @@ serg@sergbook.mysql.com 
sergefp@mysql.com

sinisa@rhols221.adsl.netsonic.fi

stewart@mysql.com

svoj@mysql.com

tfr@beta.frontier86.ee

tfr@indrek.tfr.cafe.ee

tfr@sarvik.tfr.cafe.ee

BitKeeper/triggers/post-commit

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ BK_STATUS=$BK_STATUS$BK_COMMIT 
if [ "$BK_STATUS" = OK ]

then 



HAS_ACTUAL_CHANGES=`bk cset -r+ -d | grep -v "^#"`

if [ "$HAS_ACTUAL_CHANGES" = "" ]

then

  echo ChangeSet had no real changes, not sending emails

  exit

fi



CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet`

BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'`

WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'`

Build-tools/Do-hpux-depot

0 → 100755
+85 −0
Original line number Diff line number Diff line 
#!/usr/bin/perl



#

# By Matt Wagner <matt@mysql.com> 2005

#

# This script generates HP Depot packages for MySQL Server.

# It basically repackages a binary tarball as a depot.

#

# Usage: ./Do-hpux-depot <untarred-binary-tarball>

#



$fullname = shift @ARGV;

$fullname or die "No package name was specified";

-d $fullname or die "That directory is not present!";



$fullname =~ s,/+$,,;             # Remove ending slash if any



chomp($pwd= `pwd`);



%title= (

  "mysql-standard" => "MySQL Community Edition - Standard (GPL)",

  "mysql-debug" => "MySQL Community Edition - Debug (GPL)",

  "mysql-max" => "MySQL Community Edition - Experimental (GPL)",

  "mysql-pro" => "MySQL Pro (Commercial)",

  "mysql-classic" => "MySQL Classic (Commercial)",

  "mysql-cluster" => "MySQL Cluster (Commercial)",

);



%architecture= (

  "hpux11.23" => "HP-UX_B.11.23",

  "hpux11.11" => "HP-UX_B.11.11",

  "hpux11.00" => "HP-UX_B.11.00",

);



%os_release= (

  "hpux11.23" => "?.11.2?",

  "hpux11.11" => "?.11.1?",

  "hpux11.00" => "?.11.0?",

);



%machine_type= (

  "ia64" => "ia64*",

  "hppa2.0w" => "9000/*",

);



$fullname =~ m/^(mysql-\w+)-([\d\.]+)-hp-(hpux11\.\d\d)-(hppa2\.0w|(ia64))-?(64bit)?$/;



# print "title: $1\n";

# print "version: $2\n";

# print "os: $3\n";

# print "cpu: $4\n";

# print "64: $6\n";



$cpu64= ($6 ne "") ? "_64" : "";



open (PSF,">${fullname}.psf") or die "Unable to write PSF file ($!)\n";



print PSF <<EOF;

product

        tag $1 

        vendor_tag "MySQL_AB"

        title "$title{$1}"

        description "MySQL Database Server and Clients"

        revision $2



        architecture $architecture{$3}$cpu64

        machine_type $machine_type{$4}

        os_name HP-UX

        os_release $os_release{$3}

        directory /usr/local



        fileset

                tag all

                revision $2

		directory $fullname=/usr/local/$fullname

                file_permissions -u 222 -g bin -o bin

                file *

        end

end

EOF



close(PSF);



system("/usr/sbin/swpackage -v -d \"|gzip -c > $fullname.depot.gz\" -x target_type=tape -s ${pwd}/${fullname}.psf");

cmd-line-utils/readline/bind.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ rl_generic_bind (type, keyseq, data, map) 
	     mapped to something, `abc' to be mapped to something else,

	     and the function bound  to `a' to be executed when the user

	     types `abx', leaving `bx' in the input queue. */

	  if (k.function /* && k.type == ISFUNC */)

	  if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))

	    {

	      map[ANYOTHERKEY] = k;

	      k.function = 0;

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.10)

AM_INIT_AUTOMAKE(mysql, 4.1.11)

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=10

NDB_VERSION_BUILD=11

NDB_VERSION_STATUS=""



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