Commit d9ca7b67 authored by serg@janus.mylan's avatar serg@janus.mylan
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
parents 6accbba0 d902f4d3

.bzrignore

+7 −0
Original line number Diff line number Diff line
@@ -902,6 +902,7 @@ libmysql_r/.libs/libmysqlclient_r.so.15.0.0 
libmysql_r/acconfig.h

libmysql_r/client_settings.h

libmysql_r/conf_to_src

libmysql_r/link_sources

libmysql_r/my_static.h

libmysql_r/mysys_priv.h

libmysql_r/vio_priv.h
@@ -1137,6 +1138,7 @@ libmysqld/rpl_filter.cc 
libmysqld/rpl_injector.cc

libmysqld/rpl_record.cc

libmysqld/rpl_record_old.cc

libmysqld/scheduler.cc

libmysqld/set_var.cc

libmysqld/simple-test

libmysqld/slave.cc
@@ -1153,6 +1155,7 @@ libmysqld/sql_builtin.cc 
libmysqld/sql_cache.cc

libmysqld/sql_class.cc

libmysqld/sql_command

libmysqld/sql_connect.cc

libmysqld/sql_crypt.cc

libmysqld/sql_cursor.cc

libmysqld/sql_cursor.h
@@ -1183,6 +1186,7 @@ libmysqld/sql_show.cc 
libmysqld/sql_state.c

libmysqld/sql_string.cc

libmysqld/sql_table.cc

libmysqld/sql_tablespace.cc

libmysqld/sql_test.cc

libmysqld/sql_trigger.cc

libmysqld/sql_udf.cc
@@ -1841,6 +1845,7 @@ scripts/make_binary_distribution 
scripts/make_sharedlib_distribution

scripts/make_win_binary_distribution

scripts/make_win_src_distribution

scripts/make_win_src_distribution_old

scripts/msql2mysql

scripts/mysql_config

scripts/mysql_convert_table_format
@@ -2082,6 +2087,7 @@ sql/gen_lex_hash 
sql/gmon.out

sql/handlerton.cc

sql/lex_hash.h

sql/link_sources

sql/max/*

sql/message.h

sql/message.mc
@@ -3003,5 +3009,6 @@ vio/viotest.cpp 
win/configure.data

win/vs71cache.txt

win/vs8cache.txt

ylwrap

zlib/*.ds?

zlib/*.vcproj

Docs/INSTALL-BINARY

+1 −1
Original line number Diff line number Diff line 


You can find information about how to install binary distributions at



  http://dev.mysql.com/doc/refman/5.0/en/quick-standard-installation.html

  http://dev.mysql.com/doc/refman/5.1/en/quick-standard-installation.html



The MySQL Reference Manual is also available in various formats on

http://dev.mysql.com/doc; if you're interested in the DocBook XML

Docs/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
# along with this program; if not, write to the Free Software

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA



EXTRA_DIST =		mysql.info INSTALL-BINARY

EXTRA_DIST =		mysql.info INSTALL-BINARY @extra_docs@



# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

INSTALL-SOURCE

+1 −1
Original line number Diff line number Diff line 


You can find information about how to install from a source distributions at



  http://dev.mysql.com/doc/refman/5.0/en/installing-source.html

  http://dev.mysql.com/doc/refman/5.1/en/installing-source.html



The MySQL Reference Manual is also available in various formats on

http://dev.mysql.com/doc; if you're interested in the DocBook XML

INSTALL-WIN-SOURCE

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
You can find information about how to install from a Windows source

distributions at



  http://dev.mysql.com/doc/refman/5.0/en/windows-source-build.html

  http://dev.mysql.com/doc/refman/5.1/en/windows-source-build.html



The MySQL Reference Manual is also available in various formats on

http://dev.mysql.com/doc; if you're interested in the DocBook XML