merged

d65ccb44 · serg@serg.mylan · e3b9c804 · 86d6b161 · d65ccb44 · e3b9c804
Commit d65ccb44 authored Apr 13, 2006 by serg@serg.mylan
117 changed files
--- a/.bzrignore
+++ b/.bzrignore
@@ -1759,3 +1759,4 @@ vio/viotest.cpp
 zlib/*.ds?
 zlib/*.vcproj
 mysql-test/r/*.log
+client/mysql_upgrade
--- a/Docs/Books/algor.eps
+++ b/Docs/Books/algor.eps
--- a/Docs/Books/algor.gif
+++ b/Docs/Books/algor.gif
--- a/Docs/Books/algor.txt
+++ b/Docs/Books/algor.txt
--- a/Docs/Books/dbi.eps
+++ b/Docs/Books/dbi.eps
--- a/Docs/Books/dbi.gif
+++ b/Docs/Books/dbi.gif
--- a/Docs/Books/dbi.txt
+++ b/Docs/Books/dbi.txt
--- a/Docs/Books/dubois.eps
+++ b/Docs/Books/dubois.eps
--- a/Docs/Books/dubois.gif
+++ b/Docs/Books/dubois.gif
--- a/Docs/Books/dubois.txt
+++ b/Docs/Books/dubois.txt
--- a/Docs/Books/ecomm.eps
+++ b/Docs/Books/ecomm.eps
--- a/Docs/Books/ecomm.gif
+++ b/Docs/Books/ecomm.gif
--- a/Docs/Books/ecomm.txt
+++ b/Docs/Books/ecomm.txt
--- a/Docs/Books/in_21.eps
+++ b/Docs/Books/in_21.eps
--- a/Docs/Books/in_21.gif
+++ b/Docs/Books/in_21.gif
--- a/Docs/Books/in_21.txt
+++ b/Docs/Books/in_21.txt
--- a/Docs/Books/manual.eps
+++ b/Docs/Books/manual.eps
--- a/Docs/Books/manual.gif
+++ b/Docs/Books/manual.gif
--- a/Docs/Books/manual.txt
+++ b/Docs/Books/manual.txt
--- a/Docs/Books/msql.eps
+++ b/Docs/Books/msql.eps
--- a/Docs/Books/msql.gif
+++ b/Docs/Books/msql.gif
--- a/Docs/Books/msql.txt
+++ b/Docs/Books/msql.txt
--- a/Docs/Books/prof.eps
+++ b/Docs/Books/prof.eps
--- a/Docs/Books/prof.gif
+++ b/Docs/Books/prof.gif
--- a/Docs/Books/prof.txt
+++ b/Docs/Books/prof.txt
--- a/Docs/Books/pthreads.eps
+++ b/Docs/Books/pthreads.eps
--- a/Docs/Books/pthreads.gif
+++ b/Docs/Books/pthreads.gif
--- a/Docs/Books/pthreads.txt
+++ b/Docs/Books/pthreads.txt
--- a/Docs/Books/realmen.eps
+++ b/Docs/Books/realmen.eps
--- a/Docs/Books/realmen.gif
+++ b/Docs/Books/realmen.gif
--- a/Docs/Books/realmen.txt
+++ b/Docs/Books/realmen.txt
--- a/Docs/Books/sql-99.eps
+++ b/Docs/Books/sql-99.eps
--- a/Docs/Books/sql-99.gif
+++ b/Docs/Books/sql-99.gif
--- a/Docs/Books/sql-99.txt
+++ b/Docs/Books/sql-99.txt
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
--- a/Docs/MySQL-logos/mysql-01.gif
+++ b/Docs/MySQL-logos/mysql-01.gif
--- a/Docs/MySQL-logos/mysql-02.gif
+++ b/Docs/MySQL-logos/mysql-02.gif
--- a/Docs/MySQL-logos/mysql-03.gif
+++ b/Docs/MySQL-logos/mysql-03.gif
--- a/Docs/MySQL-logos/mysql-04.gif
+++ b/Docs/MySQL-logos/mysql-04.gif
--- a/Docs/MySQL-logos/mysql-05.gif
+++ b/Docs/MySQL-logos/mysql-05.gif
--- a/Docs/MySQL-logos/mysql-06.gif
+++ b/Docs/MySQL-logos/mysql-06.gif
--- a/Docs/MySQL-logos/mysql-07.gif
+++ b/Docs/MySQL-logos/mysql-07.gif
--- a/Docs/MySQL-logos/mysql-08.gif
+++ b/Docs/MySQL-logos/mysql-08.gif
--- a/Docs/MySQL-logos/mysql-09.gif
+++ b/Docs/MySQL-logos/mysql-09.gif
--- a/Docs/MySQL-logos/mysql-10.gif
+++ b/Docs/MySQL-logos/mysql-10.gif
--- a/Docs/MySQL-logos/mysql-11.gif
+++ b/Docs/MySQL-logos/mysql-11.gif
--- a/Docs/MySQL-logos/mysql-12.gif
+++ b/Docs/MySQL-logos/mysql-12.gif
--- a/Docs/MySQL-logos/mysql-13.gif
+++ b/Docs/MySQL-logos/mysql-13.gif
--- a/Docs/MySQL-logos/mysql-14.gif
+++ b/Docs/MySQL-logos/mysql-14.gif
--- a/Docs/MySQL-logos/mysql-15.gif
+++ b/Docs/MySQL-logos/mysql-15.gif
--- a/Docs/MySQL-logos/mysql-16.gif
+++ b/Docs/MySQL-logos/mysql-16.gif
--- a/Docs/MySQL-logos/mysql-17.gif
+++ b/Docs/MySQL-logos/mysql-17.gif
--- a/Docs/MySQL-logos/mysql-compatible.jpg
+++ b/Docs/MySQL-logos/mysql-compatible.jpg
--- a/Docs/MySQL-logos/mysql_anim-01.gif
+++ b/Docs/MySQL-logos/mysql_anim-01.gif
--- a/Docs/MySQL-logos/mysql_anim-02.gif
+++ b/Docs/MySQL-logos/mysql_anim-02.gif
--- a/Docs/MySQL-logos/mysql_anim-03.gif
+++ b/Docs/MySQL-logos/mysql_anim-03.gif
--- a/Docs/MySQL-logos/mysql_anim-04.gif
+++ b/Docs/MySQL-logos/mysql_anim-04.gif
--- a/Docs/MySQL-logos/mysql_anim-05.gif
+++ b/Docs/MySQL-logos/mysql_anim-05.gif
--- a/Docs/MySQL-logos/mysql_anim-06.gif
+++ b/Docs/MySQL-logos/mysql_anim-06.gif
--- a/Docs/Support/.cvsignore
+++ b/Docs/Support/.cvsignore
--- a/Docs/Support/colspec-fix.pl
+++ b/Docs/Support/colspec-fix.pl
--- a/Docs/Support/docbook-fixup.pl
+++ b/Docs/Support/docbook-fixup.pl
--- a/Docs/Support/docbook-prefix.pl
+++ b/Docs/Support/docbook-prefix.pl
--- a/Docs/Support/docbook-split
+++ b/Docs/Support/docbook-split
--- a/Docs/Support/make-docbook
+++ b/Docs/Support/make-docbook
--- a/Docs/Support/make-makefile
+++ b/Docs/Support/make-makefile
--- a/Docs/Support/test-make-manual
+++ b/Docs/Support/test-make-manual
--- a/Docs/Support/test-make-manual-de
+++ b/Docs/Support/test-make-manual-de
--- a/Docs/Support/trivial-makeinfo-4.0c.patch
+++ b/Docs/Support/trivial-makeinfo-4.0c.patch
--- a/Docs/Support/xwf
+++ b/Docs/Support/xwf
--- a/Docs/Tutorial-MySQL-final.txt
+++ b/Docs/Tutorial-MySQL-final.txt
--- a/Docs/bk.txt
+++ b/Docs/bk.txt
--- a/Docs/changelog-4.0.xml
+++ b/Docs/changelog-4.0.xml
--- a/Docs/changelog-4.1.xml
+++ b/Docs/changelog-4.1.xml
--- a/Docs/changelog-5.0.xml
+++ b/Docs/changelog-5.0.xml
--- a/Docs/Support/generate-text-files.pl
+++ b/Docs/Support/generate-text-files.pl
--- a/Docs/sp-implemented.txt
+++ b/Docs/sp-implemented.txt
--- a/Makefile.am
+++ b/Makefile.am
--- a/SSL/Makefile.am
+++ b/SSL/Makefile.am
--- a/SSL/NOTES
+++ b/SSL/NOTES
--- a/SSL/client-req.pem
+++ b/SSL/client-req.pem
--- a/SSL/run-client
+++ b/SSL/run-client
--- a/SSL/run-server
+++ b/SSL/run-server
--- a/SSL/server-req.pem
+++ b/SSL/server-req.pem
--- a/VC++Files/mysql-test/mysql_test_run_new.dsp
+++ b/VC++Files/mysql-test/mysql_test_run_new.dsp
--- a/VC++Files/mysql-test/mysql_test_run_new.vcproj
+++ b/VC++Files/mysql-test/mysql_test_run_new.vcproj
--- a/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
+++ b/VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
--- a/VC++Files/mysql.dsw
+++ b/VC++Files/mysql.dsw
--- a/VC++Files/mysql.sln
+++ b/VC++Files/mysql.sln
--- a/client/Makefile.am
+++ b/client/Makefile.am
--- a/client/mysqlmanager-pwgen.c
+++ b/client/mysqlmanager-pwgen.c
--- a/client/mysqlmanagerc.c
+++ b/client/mysqlmanagerc.c
--- a/configure.in
+++ b/configure.in
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
--- a/mysql-test/init_db.sql
+++ b/mysql-test/init_db.sql
--- a/mysql-test/my_create_tables.c
+++ b/mysql-test/my_create_tables.c
--- a/mysql-test/my_manage.c
+++ b/mysql-test/my_manage.c
--- a/mysql-test/my_manage.h
+++ b/mysql-test/my_manage.h
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
--- a/mysql-test/mysql_test_run_new.c
+++ b/mysql-test/mysql_test_run_new.c
--- a/SSL/cacert.pem
+++ b/SSL/cacert.pem
--- a/SSL/client-cert.pem
+++ b/SSL/client-cert.pem
--- a/SSL/client-key.pem
+++ b/SSL/client-key.pem
--- a/SSL/server-cert.pem
+++ b/SSL/server-cert.pem
--- a/SSL/server-key.pem
+++ b/SSL/server-key.pem
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
--- a/scripts/mysql_upgrade.sh
+++ b/scripts/mysql_upgrade.sh
--- a/server-tools/instance-manager/options.cc
+++ b/server-tools/instance-manager/options.cc
--- a/server-tools/instance-manager/options.h
+++ b/server-tools/instance-manager/options.h
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
--- a/tools/managertest1.nc
+++ b/tools/managertest1.nc
--- a/tools/mysqlmanager-sample.pwd
+++ b/tools/mysqlmanager-sample.pwd
--- a/tools/mysqlmanager.c
+++ b/tools/mysqlmanager.c