Commit 6bedc859 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

merged

parents c739f7f4 b2f0171b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ myisam/mi_test_all
myisam/myisamchk
myisam/myisamlog
myisam/myisampack
myisam/test1.MYD
myisam/test1.MYI
mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/mysql-test-run
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ jani@janikt.pp.saunalahti.fi
jcole@abel.spaceapes.com
jcole@main.burghcom.com
jcole@tetra.spaceapes.com
miguel@light.local
monty@donna.mysql.fi
monty@hundin.mysql.fi
monty@tik.mysql.fi
+4 −4
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ READ_LINE: while ($_ = &next_line)
      print "# end of multitable with $multitable_cols columns\n"
	if $debug and $DEBUG_USER;
      $in_multitable = 0;
      push(@lines, "</TR>\n");
      push(@lines, "</TD></TR>\n");
      &html_pop_if('TR');
      push(@lines, "</TABLE>\n");
&html_pop_if('TABLE');
@@ -1076,8 +1076,8 @@ EOC
	{
	  # All this is a **HACK**.
	  # It does only work for a FEW SIMPLE CASES !!!
	  push(@lines, &debug("</TR>\n", __LINE__))
	    unless $html_element eq 'TABLE';;
	  push(@lines, &debug("</TD></TR>\n", __LINE__))
	    unless $html_element eq 'TABLE';
	  &html_pop_if('TR');
	  $what =~ s|\s+\@tab\s*| </TD><TD> |g;
	  push(@lines, &debug("<TR><TD>$what\n", __LINE__));
+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}
+16 −4
Original line number Diff line number Diff line
@@ -1378,8 +1378,9 @@ of @strong{MySQL} so that we could accelerate the development pace. If you
are interested in doing this, you can email @email{partner@@mysql.com} about 
this!
@strong{MySQL AB} has currently 20+ people on its payroll and is growing 
rapidly.  @uref{http://www.mysql.com/development/team.html}.
@strong{MySQL AB} has currently 20+ people
(@uref{http://www.mysql.com/development/team.html}) on its payroll and is growing rapidly.
Our main sources of income are:
@@ -3086,6 +3087,11 @@ If so, it may have a local mailing list, so that messages sent from
cases, please contact your system administrator to be added to or dropped
from the local @strong{MySQL} list.
If you wish to have traffic for a mailing list go to a separate mailbox in
your mail program, set up a filter based on the message headers.  You can
use either the @code{List-ID:} or @code{Delivered-To:} headers to identify
list messages.
The following @strong{MySQL} mailing lists exist:
@table @code
@@ -4422,6 +4428,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@image{Flags/france} France [mtesa.net] @
@uref{http://mysql.mtesa.net/, WWW}
@item
@c EMAIL: mrjack@fastorama.com (MrJacK)
@image{Flags/france} France [fastorama.com, Chatenois] @
@uref{http://mysql.fastorama.com/, WWW}
@uref{ftp://ftp.fastorama.com/unix/mysql/, FTP}
@c @item
@c Not ok 20000919; Old site (Matt)
@c EMAIL: Jaakko.Hyvatti@eunet.fi
@@ -5564,7 +5576,7 @@ shell> scripts/mysql_install_db
shell> chown -R root  /usr/local/mysql
shell> chown -R mysql /usr/local/mysql/data
shell> chgrp -R mysql /usr/local/mysql
shell> chown -R root /usr/local/mysql/bin/
shell> chown -R root /usr/local/mysql/bin
shell> bin/safe_mysqld --user=mysql &
@end example
@@ -5695,7 +5707,7 @@ directory to the user that you will run @code{mysqld} as:
@example
shell> chown -R root  /usr/local/mysql
shell> chown -R mysql /usr/local/mysql/var
shell> chown -R mysql /usr/local/mysql/data
shell> chgrp -R mysql /usr/local/mysql
@end example
Loading