Commit 8f2c07e2 authored by tim@white.box's avatar tim@white.box
Browse files

Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3

parents 58766d3a 6192d838

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line 
heikki@donna.mysql.fi

jani@janikt.pp.saunalahti.fi

miguel@light.local

monty@hundin.mysql.fi

monty@tik.mysql.fi

monty@work.mysql.com

BitKeeper/triggers/post-commit

+6 −3
Original line number Diff line number Diff line
@@ -37,9 +37,12 @@ From: $FROM 
To: $INTERNALS

Subject: bk commit into 3.23 tree



Below is the list of changes that have just been pushed into main

3.23. repository. For information on how to access the repository

see http://www.mysql.com/doc/I/n/Installing_source_tree.html

Below is the list of changes that have just been commited into a local

3.23. repository of $USER. When $USER does a push, they will be

propogaged to the main repository and within 24 hours after the push into

the public repository. For information on how to access

the public repository see

http://www.mysql.com/doc/I/n/Installing_source_tree.html



EOF

  bk changes -v -r+

BitKeeper/triggers/post-incoming

0 → 100755
+3 −0
Original line number Diff line number Diff line 
#! /bin/sh



echo "Test: post-incoming works"

BitKeeper/triggers/post-outgoing

0 → 100755
+3 −0
Original line number Diff line number Diff line 
#! /bin/sh



echo "Test: post-outgoing works"

Docs/manual.ja.texi

+2 −2
Original line number Diff line number Diff line
@@ -33032,7 +33032,7 @@ Performance handicapping system for yachts. Uses PHP. By 














@item @uref{http://www.mysql.com/Contrib/hylalog-1.0.tar.gz, hylalog-1.0.tar.gz}















Store @code{hylafax} outgoing faxes in a @strong{MySQL} database. By Sinisa













Milivojevic, @email{sinisa@@coresinc.com}.













Milivojevic, @email{sinisa@@mysql.com}.





























@item @uref{http://www.mysql.com/Contrib/mrtg-mysql-1.0.tar.gz, mrtg-mysql-1.0.tar.gz}















@strong{MySQL} status plotting with MRTG, by Luuk de Boer, @email{luuk@@wxs.nl}.










@@ -33268,7 +33268,7 @@ The @file{libmysql.dll} library.













Mysqlmanager, a Win32 GUI tool for administrating @strong{MySQL}.















@item Curt Sampson @email{cjs@@portal.ca}















Porting of MIT-pthreads to NetBSD/Alpha and NetBSD 1.3/i386.













@item Sinisa Milivojevic @email{sinisa@@coresinc.com}













@item Sinisa Milivojevic @email{sinisa@@mysql.com}















Compression (with @code{zlib}) to the client/server protocol.















Perfect hashing for the lexical analyzer phase.















@item Antony T. Curtis @email{antony.curtis@@olcs.net}