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

into  mysql.com:/home/kent/bk/main/mysql-5.0


myisam/mi_check.c:
  Auto merged
myisam/mi_dynrec.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_test1.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/rt_split.c:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged

BUILD/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2002, 2004-2005 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 PROJECT(MySql)
 
 # This reads user configuration, generated by configure.js.

Docs/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

Docs/Support/colspec-fix.pl

-#!/usr/bin/perl -w
-
-#
-# Script to rewrite colspecs from relative values to absolute values
-#
-
-# arjen 2002-03-14 append "cm" specifier to colwidth field.
-
-use strict;
-
-my $table_width  = 12.75; # Specify the max width of the table in cm
-my $gutter_width =  0.55; # Specify the width of the gutters in cm
-
-my $str = join '', <>; # Push stdin (or file)
-
-$str =~ s{([\t ]*(<colspec colwidth=\".+?\" />\s*)+)}
-         {&rel2abs($1)}ges;
-
-print STDOUT $str;
-exit;
-
-#
-# Definitions for helper sub-routines
-#
-
-sub msg {
-    print STDERR shift, "\n";
-}
-
-sub rel2abs {
-    my $str           = shift;
-    my $colnum        = 1;
-    
-    my @widths        = ();
-    my $total         = 0;
-    my $output        = '';
-    
-    my $gutters;
-    my $content_width;
-    my $total_width;
-    my @num_cache;
-    
-    $str =~ /^(\s+)/;
-    my $ws = $1;
-    
-    while ($str =~ m/<colspec colwidth="(\d+)\*" \/>/g) {
-        $total += $1;
-        push @widths, $1;
-    }
-
-    msg("!!! WARNING: Total Percent > 100%: $total%") if $total > 100;
-
-    if (! $total) {
-        die 'Something bad has happened - the script believes that there are no columns';
-    }
-
-    $gutters = $#widths * $gutter_width;
-    $content_width = $table_width - $gutters;
-    # Don't forget that $#... is the last offset not the count
-
-    foreach (@widths) {
-        my $temp = sprintf ("%0.2f", $_/100 * $content_width);
-        $total_width += $temp;
-
-        if ($total_width > $content_width) {
-            $temp -= $total_width - $content_width;
-            msg("!!! WARNING: Column width reduced from " .
-                ($temp + ($total_width - $content_width)) . " to $temp !!!");
-            $total_width -= $total_width - $content_width;
-        }
-        
-        $output .= $ws . '<colspec colnum="'. $colnum .'" colwidth="'. $temp .'cm" />' . "\n";
-        ++$colnum;
-        push @num_cache, $temp;
-    }
-   
-    return $output . "\n$ws";
-}

Docs/Support/docbook-fixup.pl

-#!/usr/bin/perl -w
-
-# Fix the output of `makeinfo --docbook` version 4.0c
-# Convert the broken docbook output to well-formed XML that conforms to the O'Reilly idiom
-# See code for detailed comments
-# Authors: Arjen Lentz and Zak Greant (original code by Jeremy Cole)
-
-use strict;
-
-my $data  = '';
-my @apx   = ();
-my $apx   = '';
-my @nodes = ();
-my $nodes = '';
-
-msg ("-- Post-processing `makeinfo --docbook` output --");
-msg ("** Written to work with makeinfo version 4.0c **\n");
-
-msg ("Discarding DTD - not required by subsequent scripts");
-# <> is a magic filehandle - either reading lines from stdin or from file(s) specified on the command line
-<>;
-
-msg ("Create an XML PI with ISO-8859-1 character encoding");
-$data = "<?xml version='1.0' encoding='ISO-8859-1'?>";
-
-msg ("Get the rest of the data");
-$data = $data . join "", <>;
-
-msg ("Add missing <bookinfo> and <abstract> opening tags");
-# Note the absence of the g (global) pattern modified. This situation can only happen once.
-# ...as soon as we find the first instance, we can stop looking.
-$data =~ s/<book lang="en">/<book lang="en"><bookinfo><abstract>/;
-
-
-# arjen 2002-05-01
-msg ("Processing docbook-prefix special strings");
-$data =~ s/FIXUPmdashFIXUP/\&mdash\;/g;
-
-$data =~ s/FIXUPdoubledashFIXUP/--/g;
-
-$data =~ s/FIXUPstrongFIXUP/<emphasis\ role\=\"bold\">/g;
-$data =~ s/FIXUPendstrongFIXUP/<\/emphasis>/g;
-
-$data =~ s/FIXUPemphFIXUP/<emphasis>/g;
-$data =~ s/FIXUPendemphFIXUP/<\/emphasis>/g;
-
-$data =~ s/FIXUPfileFIXUP/<filename>/g;
-$data =~ s/FIXUPendfileFIXUP/<\/filename>/g;
-
-$data =~ s/FIXUPsampFIXUP/<literal>/g;
-$data =~ s/FIXUPendsampFIXUP/<\/literal>/g;
-
-
-msg ("Removing mailto: from email addresses...");
-$data =~ s/mailto://g;
-
-msg ("Removing INFORMALFIGURE...");
-$data =~ s{<informalfigure>.+?</informalfigure>}
-          {}gs;
-
-msg ("Convert ampersand to XML escape sequence...");
-$data =~ s/&(?!\w+;)/&amp;/g;
-
-# arjen 2002-05-01
-msg ("Changing (TM) to XML escape sequence...");
-$data =~ s/MySQL \(TM\)/MySQL&trade;/g;
-$data =~ s{<command>TM</command>}
-          {&trade;}g;
-
-# arjen 2002-05-01
-msg ("Changing ' -- ' to XML escape sequence...");
-$data =~ s/ -- /&mdash;/g;
-
-msg ("Changing @@ to @...");
-$data =~ s/@@/@/g;
-
-msg ("Rework references of the notation '<n>'");
-# Need to talk to Arjen about what the <n> bits are for
-$data =~ s/<(\d)>/[$1]/g;
-
-msg ("Changing '_' to '-' in references...");
-$data =~ s{((?:id|linkend)=\".+?\")}
-          {&underscore2hyphen($1)}gex;
-
-msg ("Changing ULINK to SYSTEMITEM...");
-$data =~ s{<ulink url=\"(.+?)\">\s*</ulink>}
-          {<systemitem role=\"url\">$1</systemitem>}gs;
-
-msg ("Adding PARA inside ENTRY...");
-$data =~ s{<entry>(.*?)</entry>}
-          {<entry><para>$1</para></entry>}gs;
-
-msg ("Fixing spacing problem with titles...");
-$data =~ s{(</\w+>)(\w{2,})}
-          {$1 $2}gs;
-
-msg ("Adding closing / to XREF and COLSPEC tags...");
-$data =~ s{<(xref|colspec) (.+?)>}
-          {<$1 $2 />}gs;
-
-# arjen 2002-04-26
-msg ("Removing separate target titles from LINKs and make them XREFs...");
-$data =~ s{<link (linkend=.+?)>.+?</link>}
-          {<xref $1 />}gs;
-
-# Probably need to strip these
-msg ('Adding "See " to XREFs that used to be @xref...');
-$data =~ s{([.'!)])\s*<xref }
-          {$1 See <xref }gs;
-
-msg ('Adding "see " to (XREFs) that used to be (@pxref)...');
-$data =~ s{([([,;])(\s*)<xref }
-          {$1$2see <xref }gs;
-
-msg ("Making first row in table THEAD...");
-$data =~ s{( *)<tbody>(\s*<row>.+?</row>)}
-          {$1<thead>$2\n$1</thead>\n$1<tbody>}gs;
-
-msg ("Removing EMPHASIS inside THEAD...");
-$data =~ s{<thead>(.+?)</thead>}
-          {"<thead>".&strip_tag($1, 'emphasis')."</thead>"}gsex;
-
-msg ("Removing empty PARA...");
-$data =~ s{<para>\s*</para>}
-          {}gs;
-
-msg ("Removing lf before /PARA in ENTRY...");
-$data =~ s{\n(</para></entry>)}
-          {$1}gs;
-
-msg ("Removing whitespace before /PARA if not on separate line...");
-$data =~ s{(\S+)[\t ]+</para>}
-          {$1</para>}g;
-
-msg ("Removing PARA around INDEXTERM if no text in PARA...");
-$data =~ s{<para>((?:<indexterm role=\"[^"]+\">(?:<(primary|secondary)>[^>]+</\2>)+?</indexterm>)+?)\s*</para>}
-          {$1}gs;
-
-@apx = ("Users", "MySQL Testimonials", "News", "GPL-license", "LGPL-license");
-
-foreach $apx (@apx) {
-    msg ("Removing appendix $apx...");
-    $data =~ s{<appendix id=\"$apx\">(.+?)</appendix>}
-              {}gs;
-
-    # Skip to next appendix regex if the regex did not match anything
-    next unless (defined $&);
-    
-    msg ("...Building list of removed nodes...");
-    
-    # Split the last bracketed regex match into an array
-    # Extract the node names from the tags and push them into an array
-    foreach (split "\n", $&) {
-        push @nodes, $1 if /<\w+ id=\"(.+?)\">/
-    }
-}
-
-# 2002-02-22 arjen@mysql.com (added fix " /" to end of regex, to make it match)
-msg ("Fixing references to removed nodes...");
-# Merge the list of node names into a set of regex alternations
-$nodes = join "|", @nodes;
-
-# Find all references to removed nodes and convert them to absolute URLs
-$data =~ s{<\w+ linkend="($nodes)" />}
-          {&xref2link($1)}ges;
-
-print STDOUT $data;
-exit;
-
-#
-# Definitions for helper sub-routines
-#
-
-sub msg {
-    print STDERR "docbook-fixup:", shift, "\n";
-}
-
-sub strip_tag($$) {
-    (my $str, my $tag) = @_;
-    $str =~ s{<$tag>(.+?)</$tag>}{$1}gs;
-    return $str;
-}
-
-sub underscore2hyphen($) {
-    my $str = shift;
-    $str =~ tr/_/-/;
-    return $str;
-}
-
-sub xref2link {
-    my $ref = shift;
-    $ref =~ tr/ /_/;
-    $ref =~ s{^((.)(.).+)$}{$2/$3/$1.html};
-    return "http://www.mysql.com/doc/" . $ref;
-}
-
-# We might need to encode the high-bit characters to ensure proper representation
-# msg ("Converting high-bit characters to entities");
-# $data =~ s/([\200-\400])/&get_entity($1)>/gs;
-# There is no get_entity function yet - no point writing it til we need it :)

Docs/Support/docbook-prefix.pl

-#!/usr/bin/perl -w
-
-# Preprocess the input of `makeinfo --docbook` version 4.0c
-# Authors: Arjen Lentz and Zak Greant (started by arjen 2002-05-01)
-
-use strict;
-
-my $data  = '';
-
-msg ("-- Pre-processing `makeinfo --docbook` input --");
-msg ("** Written to work with makeinfo version 4.0c **\n");
-
-# <> is a magic filehandle - either reading lines from stdin or from file(s) specified on the command line
-msg ("Get the data");
-$data = join "", <>;
-
-msg ("Replacing '\@-' with FIXUPmdashFIXUP");
-$data =~ s/\@-/FIXUPmdashFIXUP/g;
-
-msg ("Replacing '--' with FIXUPdoubledashFIXUP");
-$data =~ s/--/FIXUPdoubledashFIXUP/g;
-
-msg ("Turning \@strong{} into LITERAL blocks");
-$data =~ s/\@strong\{(.*?)\}/FIXUPstrongFIXUP$1FIXUPendstrongFIXUP/gs;
-
-msg ("Turning \@emph{} into LITERAL blocks");
-$data =~ s/\@emph\{(.*?)\}/FIXUPemphFIXUP$1FIXUPendemphFIXUP/gs;
-
-msg ("Turning \@file{} into LITERAL blocks");
-$data =~ s/\@file\{(.*?)\}/FIXUPfileFIXUP$1FIXUPendfileFIXUP/gs;
-
-msg ("Turning \@samp{} into LITERAL blocks");
-$data =~ s/\@samp\{\@\{\}/FIXUPsampFIXUP\@\{FIXUPendsampFIXUP/g;
-$data =~ s/\@samp\{\@\}\}/FIXUPsampFIXUP\@\}FIXUPendsampFIXUP/g;
-$data =~ s/\@samp\{\@\{n\@\}\}/FIXUPsampFIXUP\@\{n\@\}FIXUPendsampFIXUP/g;
-$data =~ s/\@samp\{(.*?)\}/FIXUPsampFIXUP$1FIXUPendsampFIXUP/gs;
-
-
-msg ("Write the data");
-print STDOUT $data;
-exit;
-
-#
-# Definitions for helper sub-routines
-#
-
-sub msg {
-    print STDERR "docbook-prefix: ", shift, "\n";
-}
-

Docs/Support/docbook-split

-#! /usr/bin/perl -w
-# O'Reilly's Perl script to chop mysql.xml into separate ch/apps/index files.
-# The indexes are actually not used, they're created straight from the xrefs.
-# Breaks the MySQL reference manual into chapters, appendices, and indexes.
-
-use strict;
-
-my $app_letter      = "a";                                  # Start appendix letters at "a"
-my $chap_num        = 1;                                    # Start chapter numbers at one (there is no preface)
-my $directory       = "mysql_refman_" . time;
-my $ext             = ".xml";
-my $line            = "";
-my $output_name     = "";
-my $start_text      = "";
-
-mkdir $directory unless -d $directory;
-
-while (defined $line) {
-    if ($line =~ /(<chapter.+)/i ) {
-        $start_text = $1;
-        $output_name = sprintf("ch%02d%s", $chap_num, $ext);
-        ++$chap_num;
-        &process_file("chapter");
-    }
-    elsif ($line =~ /(<appendix.+)/i ) {
-        $start_text = $1 ;
-        $output_name = "app$app_letter$ext";
-        ++$app_letter;
-        &process_file("appendix");
-    }
-    elsif ($line =~ /(<index\s+id=")(.*?)(">.*)/i ) {
-        $start_text = $1 . $2 . $3;
-        $output_name = lc($2) . $ext;
-        &process_file("index");
-    }
-    else {
-        # Skip junk in between chapters, appendices and indexes.
-        $line = <>;
-    }
-}
-
-sub process_file {
-    my $marker  = shift;
-    my $path    = "$directory/$output_name";
-
-    open (OUTPUT_FILE, ">$path") or die "Cannot open $path";
-
-    print STDERR "Creating $path\n";
-
-    # Print out XML PI
-    print OUTPUT_FILE "<?xml version='1.0' encoding='ISO-8859-1'?>\n";
-   
-    # Print whatever happened to appear at the end of the previous chapter.
-    print OUTPUT_FILE "$start_text\n" if $start_text;
-    
-    while (defined $line) {
-        $line = <>;
-
-        # Note: Anything after the terminating marker is lost, just like
-        # lines in between chapters.
-        if ($line =~ /(.*<\/\s*$marker\s*>)/i ) {
-            print OUTPUT_FILE "$1\n" if $1;
-            close OUTPUT_FILE;
-            return;
-        }
-        print OUTPUT_FILE $line;
-    }
-}
-
-exit 0;

Docs/Support/generate-text-files.pl

 #!/usr/bin/perl -w -*- perl -*-
+# Copyright (C) 2000, 2003, 2005 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 # Generate text files from top directory from the manual.
 
 $from = shift(@ARGV);

Docs/Support/make-docbook

-#!/bin/sh
-# 2002-01-30 arjen@mysql.com
-# Use this to create mysql.xml (the DocBook XML format output of manual.texi)
-# Requires makeinfo 4.0c
-
-#create include.texi with version/port #
-        echo "@c This file is autogenerated by the Makefile" > include.texi
-        echo -n "@set mysql_version " >> include.texi
-#        grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-#         sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi
-# 2002-04-26 arjen - the below just picks #.# instead of #.#.#-alpha
-# (code by mwagner - tnx)
-        grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-         perl -p -e 's/AM_INIT_AUTOMAKE\(mysql,\s(\d+\.\d+)\..+/$1/' >> include.texi
-        echo -n "@set default_port " >> include.texi
-        grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
-         sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi
-
-# produce DocBook XML
-        Support/docbook-prefix.pl < manual.texi |\
-         makeinfo --force --no-ifinfo --docbook -o - |\
-         Support/docbook-fixup.pl > mysql.xml
-    
-        # See if the XML output is well-formed
-        xmlwf mysql.xml
-
-        # If all is well, keep processing
-        cat mysql.xml | Support/colspec-fix.pl | Support/docbook-split;
-

Docs/Support/make-makefile

-#!/bin/sh
-# Use this when you have deleted Makefile and do not want to do a full
-# build to get it back
-
-cd ..
-automake --gnu Docs/Makefile
-CONFIG_FILES=Docs/Makefile CONFIG_HEADERS= sh ./config.status

Docs/Support/test-make-manual

-#!/bin/sh
-
-needed_flags=0
-needed_texi2html=0
-needed_texinfo_tex=0
-needed_include_texi=0
-
-if [ -z $BROWSER ]; then
-    BROWSER=netscape 
-    echo "BROWSER not set, using $BROWSER"
-fi
-
-die ()
-{
-    echo
-    echo $1
-    cleanup
-    exit 1
-}
-
-cleanup ()
-{
-    echo "Cleaning up..."
-    if [ $needed_flags ]; then
-        bk clean Flags
-    fi
-
-    if [ $needed_texi2html ]; then
-        bk clean Support/texi2html
-    fi
-
-    if [ $needed_texinfo_tex ]; then
-        bk clean Support/texinfo.tex
-    fi
-
-    if [ $needed_include_texi ]; then
-        rm -f include.texi
-    fi
-
-    for file in \
-        manual.aux manual.cp  manual.cps manual.dvi  \
-        manual.fn  manual.fns manual.ky  manual.html \
-        manual.pg  manual.toc manual.tp  manual.vr   \
-        mysql.info manual_toc.html                   ;
-    do
-        rm -f $file
-    done
-        
-}
-
-
-if [ -e Flags/usa.txt ]; then
-    echo "Good, Flags are there."
-else
-    echo -n "Checking out Flags..."
-    bk edit Flags >/dev/null 2>&1
-    echo " Done."
-    needed_flags=1
-fi
-
-if [ -e Support/texi2html ]; then
-    echo "Good, texi2html is there."
-else
-    echo -n "Checking out texi2html..."
-    bk edit Support/texi2html >/dev/null 2>&1
-    echo " Done."
-    needed_texi2html=1
-fi
-
-if [ -e Support/texinfo.tex ]; then
-    echo "Good, texinfo.tex is there."
-else
-    echo -n "Checking out texinfo.tex..."
-    bk edit Support/texinfo.tex >/dev/null 2>&1
-    echo " Done."
-    needed_texinfo_tex=1
-fi
-
-if [ -e include.texi ]; then
-    echo "Good, include.texi is there."
-else
-    echo -n "Creating include.texi..."
-    bk edit ../configure.in >/dev/null 2>&1
-    echo "@c This file was generated by test-make-manual" > include.texi
-    echo -n "@set mysql_version " >> include.texi
-    grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-    sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi
-    echo -n "@set default_port " >> include.texi
-    grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
-    sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi
-    echo " Done."
-    needed_include_texi=1
-fi
-
-echo -n "Running makeinfo..."
-makeinfo --no-split -I . manual.texi
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit"
-else
-    echo " Looks good."
-fi
-
-
-echo -n "Running texi2html..."
-/usr/bin/perl ./Support/texi2html -iso -number manual.texi
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit"
-else
-    echo " Looks good."
-fi
-
-
-echo -n "Running texi2dvi..."
-texi2dvi --batch manual.texi > texi2dvi.out
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit (saved in texi2dvi.out)"
-else
-    rm texi2dvi.out
-    echo " Looks good."
-fi
-
-echo
-echo
-echo "Please examine your modifications in \`manual.html'."
-echo
-echo "If you would like to use a different browser, set the 'BROWSER' environment"
-echo "variable." 
-echo
-
-$BROWSER file:`pwd`/manual_toc.html
-
-echo "-- Press Enter to Continue --"
-read junk
-cleanup

Docs/Support/test-make-manual-de

-#!/bin/sh
-
-needed_flags=0
-needed_texi2html=0
-needed_texinfo_tex=0
-needed_include_texi=0
-
-if [ -z $BROWSER ]; then
-    BROWSER=netscape 
-    echo "BROWSER not set, using $BROWSER"
-fi
-
-die ()
-{
-    echo
-    echo $1
-    cleanup
-    exit 1
-}
-
-cleanup ()
-{
-    echo "Cleaning up..."
-    if [ $needed_flags ]; then
-        bk clean Flags
-    fi
-
-    if [ $needed_texi2html ]; then
-        bk clean Support/texi2html
-    fi
-
-    if [ $needed_texinfo_tex ]; then
-        bk clean Support/texinfo.tex
-    fi
-
-    if [ $needed_include_texi ]; then
-        rm -f include.texi
-    fi
-
-    for file in \
-        manual.de.aux manual.de.cp  manual.de.cps manual.de.dvi  \
-        manual.de.fn  manual.de.fns manual.de.ky  manual.de.html \
-        manual.de.pg  manual.de.toc manual.de.tp  manual.de.vr   \
-        mysql.de.info manual.de_toc.html                   ;
-    do
-        rm -f $file
-    done
-        
-}
-
-
-if [ -e Flags/usa.txt ]; then
-    echo "Good, Flags are there."
-else
-    echo -n "Checking out Flags..."
-    bk edit Flags >/dev/null 2>&1
-    echo " Done."
-    needed_flags=1
-fi
-
-if [ -e Support/texi2html ]; then
-    echo "Good, texi2html is there."
-else
-    echo -n "Checking out texi2html..."
-    bk edit Support/texi2html >/dev/null 2>&1
-    echo " Done."
-    needed_texi2html=1
-fi
-
-if [ -e Support/texinfo.tex ]; then
-    echo "Good, texinfo.tex is there."
-else
-    echo -n "Checking out texinfo.tex..."
-    bk edit Support/texinfo.tex >/dev/null 2>&1
-    echo " Done."
-    needed_texinfo_tex=1
-fi
-
-if [ -e include.texi ]; then
-    echo "Good, include.texi is there."
-else
-    echo -n "Creating include.texi..."
-    bk edit ../configure.in >/dev/null 2>&1
-    echo "@c This file was generated by test-make-manual" > include.texi
-    echo -n "@set mysql_version " >> include.texi
-    grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-    sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> include.texi
-    echo -n "@set default_port " >> include.texi
-    grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
-    sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> include.texi
-    echo " Done."
-    needed_include_texi=1
-fi
-
-echo -n "Running makeinfo..."
-makeinfo --no-split -I . manual.de.texi
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit"
-else
-    echo " Looks good."
-fi
-
-
-echo -n "Running texi2html..."
-/usr/bin/perl ./Support/texi2html -iso -number manual.de.texi
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit"
-else
-    echo " Looks good."
-fi
-
-
-echo -n "Running texi2dvi..."
-texi2dvi --batch manual.de.texi > texi2dvi.out
-
-if [ $? != 0 ]; then
-    die "Manual has errors - fix before you commit (saved in texi2dvi.out)"
-else
-    rm texi2dvi.out
-    echo " Looks good."
-fi
-
-echo
-echo
-echo "Please examine your modifications in \`manual.de.html'."
-echo
-echo "If you would like to use a different browser, set the 'BROWSER' environment"
-echo "variable." 
-echo
-
-$BROWSER file:`pwd`/manual.de_toc.html
-
-echo "-- Press Enter to Continue --"
-read junk
-cleanup

Docs/Support/xwf

-#!/usr/bin/perl -w
-#
-# Parse document and report first syntax (well-formedness) error found.
-#
-
-use strict;
-use XML::Parser;
-use Getopt::Std;
-
-my %opts;
-getopts('e', \%opts);
-my $ENTREFS = exists( $opts{'e'} );                 # flag: check ent refs
-
-my $parser = XML::Parser->new( 
-                               ErrorContext => 2,   # output error context
-                               );
-
-# get input from files
-if( @ARGV ) {
-    foreach( @ARGV ) {
-        my $file = $_;
-        unless( -r $file ) {
-            print STDERR "ERROR: Can't open '$file'.\n";
-            return;
-        }
-        my $input = '';
-        open( F, $file );
-        while( <F> ) { $input .= $_; }
-        close F;
-
-        # parse and report errors
-        if( &parse_string( $input )) {
-            print STDERR "ERROR in $file:\n$@\n";
-        } else {
-            print STDERR "'$file' is well-formed.\n";
-        }
-    }
-    print "All files checked.\n";
-
-# get input from STDIN
-} else {
-    my $input = "";
-    while( <STDIN> ) { $input .= $_; }
-    if( &parse_string( $input )) {
-        print STDERR "ERROR in stream:\n$@\n";
-    } else {
-        print STDERR "No syntax errors found in XML stream.\n";
-    }
-}
-
-
-# parse the string and return error message
-#
-# NOTE: By default, entity refs are not expanded.  XML::Parser can be
-# told not to expand entity refs, but will still try to find
-# replacement text just in case, which we don't want.  Therefore, we
-# need to do a stupid regexp replacement, removing entities from input.
-#
-sub parse_string {
-    my $string = shift;
-    unless( $ENTREFS ) {
-        $string =~ s/\&[^\s;]+;//g;         # remove entity references
-    }
-    eval { $parser->parse( $string ); };
-    $@ =~ s/at \/.*?$//s;               # remove module line number
-    return $@;
-}

Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -136,3 +136,5 @@ test-force-mem:
 #used by autopush.pl to run memory based tests
 
 
+# Don't update the files from bitkeeper
+%::SCCS/s.%

SSL/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2003, 2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

VC++Files/copy_mysql_files.bat

 REM stop any conflicting service
 
+@echo off
+REM Copyright (C) 2004 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 net stop mysql
 
 REM Copy binaries to c:\mysql

VC++Files/prepare

 #!/bin/sh
+# Copyright (C) 2002, 2005 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 if [ -f prepare_done ]
 then

VC++Files/test1/mysql_thr.c

+/* Copyright (C) 2002, 2004-2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
 /* Testing of connecting to MySQL from X threads */
 
 #include <windows.h>

VC++Files/thr_test/thr_test.c

+/* Copyright (C) 2003-2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
 /* Testing of thread creation to find memory allocation bug
 ** This is coded to use as few extern functions as possible!
 **

bdb/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

bdb/Makefile.in

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2001-2003, 2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

client/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

client/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

client/client_priv.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2001-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

client/completion_hash.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

client/mysqladmin.cc

-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -613,7 +613,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
     case ADMIN_VER:
       new_line=1;
       print_version();
-      puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
+      puts("Copyright (C) 2000-2006 MySQL AB");
       puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
       printf("Server version\t\t%s\n", mysql_get_server_info(mysql));
       printf("Protocol version\t%d\n", mysql_get_proto_info(mysql));
@@ -1002,7 +1002,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
+  puts("Copyright (C) 2000-2006 MySQL AB");
   puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
   puts("Administration program for the mysqld daemon.");
   printf("Usage: %s [OPTIONS] command command....\n", my_progname);

client/mysqlimport.c

-/* Copyright (C) 2000 MySQL AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -164,7 +164,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
+  puts("Copyright (C) 2000-2006 MySQL AB");
   puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
   printf("\
 Loads tables from text files in various formats.  The base name of the\n\

client/mysqlshow.c

-/* Copyright (C) 2000 MySQL AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -235,7 +235,7 @@ static void print_version(void)
 static void usage(void)
 {
   print_version();
-  puts("Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB");
+  puts("Copyright (C) 2000-2006 MySQL AB");
   puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,\nand you are welcome to modify and redistribute it under the GPL license\n");
   puts("Shows the structure of a mysql database (databases,tables and columns)\n");
   printf("Usage: %s [OPTIONS] [database [table [column]]]\n",my_progname);

dbug/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX -D__WIN32__")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

dbug/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000, 2002, 2004-2006 MySQL AB
 # 
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

extra/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

extra/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

extra/yassl/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
 
 INCLUDE_DIRECTORIES(include taocrypt/include taocrypt/mySTL)

extra/yassl/Makefile.am

 SUBDIRS = taocrypt src testsuite
 EXTRA_DIST = yassl.dsp yassl.dsw CMakeLists.txt
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

extra/yassl/src/make.bat

 REM quick and dirty build file for testing different MSDEVs
+
+@echo off
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 setlocal 
 
 set myFLAGS= /I../include /I../taocrypt/mySTL /I../taocrypt/include /W3 /c /ZI

extra/yassl/taocrypt/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 INCLUDE_DIRECTORIES(mySTL include)
 
 ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 

extra/yassl/taocrypt/Makefile.am

 SUBDIRS = src test benchmark
 EXTRA_DIST = taocrypt.dsw taocrypt.dsp CMakeLists.txt $(wildcard mySTL/*.hpp)
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

extra/yassl/taocrypt/benchmark/Makefile.am

@@ -4,3 +4,6 @@ benchmark_SOURCES  = benchmark.cpp
 benchmark_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 benchmark_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = benchmark.dsp rsa1024.der dh1024.der dsa1024.der make.bat
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

extra/yassl/taocrypt/benchmark/make.bat

 REM quick and dirty build file for testing different MSDEVs
+
+@echo off
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 setlocal 
 
 set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2

extra/yassl/taocrypt/src/make.bat

 REM quick and dirty build file for testing different MSDEVs
+
+@echo off
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 setlocal 
 
 set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2 

extra/yassl/taocrypt/test/Makefile.am

@@ -4,3 +4,6 @@ test_SOURCES = test.cpp
 test_LDADD    = $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la
 test_CXXFLAGS = -DYASSL_PURE_C
 EXTRA_DIST = make.bat
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

extra/yassl/taocrypt/test/make.bat

 REM quick and dirty build file for testing different MSDEVs
+
+@echo off
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 setlocal 
 
 set myFLAGS= /I../include /I../mySTL /c /W3 /G6 /O2

extra/yassl/testsuite/make.bat

 REM quick and dirty build file for testing different MSDEVs
+
+@echo off
+REM Copyright (C) 2006 MySQL AB
+REM 
+REM This program is free software; you can redistribute it and/or modify
+REM it under the terms of the GNU General Public License as published by
+REM the Free Software Foundation; version 2 of the License.
+REM 
+REM This program is distributed in the hope that it will be useful,
+REM but WITHOUT ANY WARRANTY; without even the implied warranty of
+REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+REM GNU General Public License for more details.
+REM 
+REM You should have received a copy of the GNU General Public License
+REM along with this program; if not, write to the Free Software
+REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+@echo on
+
 setlocal 
 
 set myFLAGS= /I../include /I../taocrypt/include /I../taocrypt/mySTL /c /W3 /G6 /O2 /MT /D"WIN32" /D"NO_MAIN_DRIVER"

heap/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 

heap/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2002, 2005-2006 MySQL AB
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

heap/_check.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/_rectest.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/heapdef.h

-/* Copyright (C) 2000,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_block.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_clear.c

-/* Copyright (C) 2000,2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_close.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_create.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_delete.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004-200 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_extra.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001, 2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_hash.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_info.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_open.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_panic.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rename.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rfirst.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rkey.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2004, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rlast.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rnext.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rprev.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rrnd.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_rsame.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_scan.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_static.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2001 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_test1.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_test2.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2003, 2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_update.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004-2005 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

heap/hp_write.c

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2000-2002, 2004-2006 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

include/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# Copyright (C) 2000-2006 MySQL AB
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public

include/help_end.h

+/* Copyright (C) 2004-2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
 #ifdef __NETWARE__
 #undef printf
 #undef puts

include/help_start.h

+/* Copyright (C) 2004-2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
 /* Divert all help information on NetWare to logger screen. */
 
 #ifdef __NETWARE__

include/my_aes.h

-/* Copyright (C) 2002 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

include/my_getopt.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002-2004 MySQL AB
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

include/my_handler.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002-2006 MySQL AB
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

include/my_time.h

-/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2004-2005 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

include/mysql_time.h

-/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2004 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

include/rijndael.h

-/* Copyright (C) 2002 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

include/sha1.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2002, 2006 MySQL AB
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

include/sql_common.h

-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+/* Copyright (C) 2003-2004, 2006 MySQL AB
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

innobase/CMakeLists.txt

+# Copyright (C) 2006 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 #SET(CMAKE_CXX_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 #SET(CMAKE_C_FLAGS_DEBUG "-DSAFEMALLOC -DSAFE_MUTEX")
 ADD_DEFINITIONS(-DMYSQL_SERVER -D_WIN32 -DWIN32 -D_LIB)

innobase/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2004, 2006 MySQL AB & Innobase Oy
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

innobase/btr/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libbtr.a
 libbtr_a_SOURCES =	btr0btr.c btr0cur.c btr0pcur.c btr0sea.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/buf/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libbuf.a
 libbuf_a_SOURCES =	buf0buf.c buf0flu.c buf0lru.c buf0rea.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/data/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libdata.a
 libdata_a_SOURCES =	data0data.c data0type.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/dict/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,3 +21,6 @@ libdict_a_SOURCES =	dict0boot.c dict0crea.c dict0dict.c dict0load.c\
 			dict0mem.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/dyn/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libdyn.a
 libdyn_a_SOURCES =	dyn0dyn.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/eval/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libeval.a
 libeval_a_SOURCES =	eval0eval.c eval0proc.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/fil/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libfil.a
 libfil_a_SOURCES =	fil0fil.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/fsp/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,3 +21,6 @@ noinst_LIBRARIES =	libfsp.a
 libfsp_a_SOURCES =	fsp0fsp.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/fut/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libfut.a
 libfut_a_SOURCES =	fut0fut.c fut0lst.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/ha/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libha.a
 libha_a_SOURCES =	ha0ha.c hash0hash.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/ibuf/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

innobase/include/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2004-2005 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

innobase/lock/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	liblock.a
 liblock_a_SOURCES =	lock0lock.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/log/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	liblog.a
 liblog_a_SOURCES =	log0log.c log0recv.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%

innobase/mach/Makefile.am

-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# & Innobase Oy
+# Copyright (C) 2001, 2003 MySQL AB & Innobase Oy
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,3 +20,6 @@ noinst_LIBRARIES =	libmach.a
 libmach_a_SOURCES =	mach0data.c
 
 EXTRA_PROGRAMS =	
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%