Commit 816ac895 authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com
Browse files

Merge paul@work.mysql.com:/home/bk/mysql-4.0 

into teton.kitebird.com:/home/paul/mysql-4.0
parents 97e464cc 041238d7

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -464,3 +464,6 @@ Docs/safe-mysql.xml 
mysys/test_vsnprintf

Docs/manual.de.log

Docs/internals.info

mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

mysql-4.0.2-alpha.tar.gz

mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz

BUILD/compile-pentium-max

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ extra_configs="$pentium_configs" 
strip=yes



extra_configs="$extra_configs --with-innodb --with-berkeley-db \

 --enable-thread-safe-client --with-openssl --with-vio"

	--with-embedded-server --enable-thread-safe-client \

	--with-openssl --with-vio"



. "$path/FINISH.sh"

BitKeeper/triggers/post-commit

+2 −1
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ EOF 


#++

# docs-commit@ mail

# Picks up anything under the Docs subdirectory (relevant for docs team).

#--

 bk changes -v -r+ | grep -q Docs/manual.texi

 bk changes -v -r+ | grep -q "  Docs/"

 if [ $? -eq 0 ]

 then

  echo "Notifying docs list at $DOCS"

Build-tools/Do-linux-build

+9 −1
Original line number Diff line number Diff line 
#! /bin/sh



set -e -x



# Only use the "--with-other-libc" parameter, if another libc actually

# exists, since this will also force static linking, which does not work

# together with OpenSSL

OTHER_LIBC_DIR=/usr/local/mysql-glibc

OTHER_LIBC=""

if [ -d OTHER_LIBC_DIR ] ; then

	OTHER_LIBC="--with-other-libc=$OTHER_LIBC_DIR"

fi



BUILD/compile-pentium-max --with-other-libc=$OTHER_LIBC_DIR \

BUILD/compile-pentium-max $OTHER_LIBC \

  --with-comment="Official MySQL Binary"  \

  --prefix=/usr/local/mysql --with-extra-charset=complex \

  --enable-thread-safe-client --enable-local-infile \

Docs/Support/update-reserved-words.pl

+13 −9
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
# 2001-11-20 Fixups by arjen@mysql.com, 2 keywords and 15 synonyms were missing

# 2001-12-07 Fixup by arjen@mysql.com, add column headings for multitable.

# 2002-05-01 Fixup by arjen@mysql.com, use 3 columns instead of 4.

# 2002-05-03 Fixup by arjen@mysql.com, fill last row to full # of columns.



print STDERR "Scanning lex.h for symbols..\n";

open LEX, "<../sql/lex.h";
@@ -28,11 +29,6 @@ while(($line = <YACC>) =~ /[\s|]+([A-Z_]+)/) { 
close YACC;





$list = sprintf("\@c Reserved word list updated %s by %s.\n".

                "\@c To regenerate, use Support/update-reserved-words.pl.\n\n",

                &pretty_date, $ENV{USER});





print STDERR "Copying reserved words to an array...\n";

foreach(keys %words) { push @words, $words{$_}; };
@@ -42,11 +38,15 @@ print STDERR "Sorting array...\n"; 
printf STDERR "There are %i reserved words.\n", scalar @words;



@pre  = ("\@item", " \@tab", " \@tab");

@post = ("\n", "\n", "\n");



$list = "";

for($i=0; $word = shift(@words); $i++) {

  $list .= sprintf "%s %-30s %s", $pre[$i%3], "\@code\{$word\}", $post[$i%3];

}; $list .= "\n";

  $list .= sprintf "%s %s\n", $pre[$i%3], "\@code\{$word\}";

}

# Fill last row to full # of columns.

for( ; $i%3; $i++) {

  $list .= sprintf "%s\n", $pre[$i%3];

}



open OLD, "<manual.texi";

open NEW, ">manual-tmp.texi";
@@ -54,10 +54,14 @@ open NEW, ">manual-tmp.texi"; 
print STDERR "Copying beginning of manual.texi...\n";

while(($line = <OLD>) !~ /START_OF_RESERVED_WORDS/) { print NEW $line; };

print NEW "\@c START_OF_RESERVED_WORDS\n\n";

printf NEW "\@c Reserved word list updated %s by %s.\n".

           "\@c To regenerate, use Support/update-reserved-words.pl.\n\n",

           &pretty_date, $ENV{USER};



print STDERR "Inserting list of reserved words...\n";

# Ensure the fractions add up to 100% otherwise it looks funny in print:

print NEW "\@multitable \@columnfractions .33 .33 .34\n";

print NEW "\@item \@strong{Word} \@tab \@strong{Word} \@tab \@strong{Word}\n";

print NEW "\@item \@strong{Word}\n \@tab \@strong{Word}\n \@tab \@strong{Word}\n";

print NEW $list;

print NEW "\@end multitable\n";

print STDERR "Skipping over old list...\n";