Commit 0f58efbd authored by unknown's avatar unknown
Browse files

Manual merge 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/olap.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged
parents 7e9984b1 ee2633a7

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ dlenev@jabberwock.localdomain 
dlenev@mysql.com

ejonore@mc03.ndb.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com

georg@beethoven.local

georg@beethoven.site

georg@lmy002.wdf.sap.corp

man/mysql.1.in

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ replace(1) 
.P

For more information please refer to the MySQL reference

manual, which may already be installed locally and which

is also available online at http://www.mysql.com/doc/en/

is also available online at http://dev.mysql.com/doc/mysql/en

.SH BUGS

Please refer to http://bugs.mysql.com/ to report bugs.

.SH AUTHOR

man/mysql_fix_privilege_tables.1.in

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ replace(1) 
.P

For more information please refer to the MySQL reference

manual, which may already be installed locally and which

is also available online at http://www.mysql.com/doc/en/

is also available online at http://dev.mysql.com/doc/mysql/en

.SH BUGS

Please refer to http://bugs.mysql.com/ to report bugs.

.SH AUTHOR

man/mysql_zap.1.in

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ replace(1) 
.P

For more information please refer to the MySQL reference

manual, which may already be installed locally and which

is also available online at http://www.mysql.com/doc/en/

is also available online at http://dev.mysql.com/doc/mysql/en

.SH BUGS

Please refer to http://bugs.mysql.com/ to report bugs.

.SH AUTHOR

man/mysqlaccess.1.in

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ replace(1) 
.P

For more information please refer to the MySQL reference

manual, which may already be installed locally and which

is also available online at http://www.mysql.com/doc/en/

is also available online at http://dev.mysql.com/doc/mysql/en

.SH BUGS

Please refer to http://bugs.mysql.com/ to report bugs.

.SH AUTHOR