summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Makefile.am:unknown2008-04-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Add ChangeLog if it exists - Removed separate 'normal+rowrepl' test run, not needed any longer - Removed separate 'rpl' test run, included in main test run already - Renamed some test "comments", to use similar naming style - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites - Reordered test runs, to be aligned with Windows test runs mysql.spec.sh: - No longer including the "Example" storage engine - Added to configure "--without-ENGINE" if not to compile engine as plugin Docs/Makefile.am: Add ChangeLog if it exists Makefile.am: - Removed separate 'normal+rowrepl' test run, not needed any longer - Removed separate 'rpl' test run, included in main test run already - Renamed some test "comments", to use similar naming style - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites - Reordered test runs, to be aligned with Windows test runs support-files/mysql.spec.sh: - No longer including the "Example" storage engine - Added to configure "--without-ENGINE" if not to compile engine as plugin
* mysql.spec.sh:unknown2008-04-021-0/+4
| | | | | | | | | | | | | | | | If excluding Federated, make sure dynamic plugin is not built Makefile.am: Only run cluster test when compiled with cluster lib_sql.cc: Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf() Makefile.am: Only run cluster test when compiled with cluster libmysqld/lib_sql.cc: Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf() support-files/mysql.spec.sh: If excluding Federated, make sure dynamic plugin is not built
* mysql.spec.sh:unknown2008-03-311-1/+35
| | | | | | | | Made Federated and Cluster optional support-files/mysql.spec.sh: Made Federated and Cluster optional
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-261-5/+28
|\ | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-buildunknown2008-03-261-5/+28
| |\ | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build support-files/mysql.server.sh: Auto merged
| | * Suggestion of Tim. Avoid unnecessary sleep.unknown2008-03-191-1/+1
| | |
| | * Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \unknown2008-03-191-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn't running Pass the process id of the manager as a parameter to "wait_for_pid" and if the manager isn't running, then do not continue to wait. Also, capture the error message of our process-existence test, "kill -0", as we expect errors and shouldn't pass them to the user. Additionally, be a bit more descriptive of what the problem is. support-files/mysql.server.sh: Test that the PID-file's manager is running while we're waiting for something to happen with the pid-file. Capture the error message of our process-existence test, "kill -0", as we expect errors and shouldn't pass them to the user. Additionally, be a bit more descriptive of what the problem is.
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-191-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51
| * \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-03-191-0/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/make_binary_distribution.sh: Use local (manual merge)
| | * | Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50unknown2008-03-191-0/+4
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/50
| | | * Bug #25486: mysqld_multi.server.sh missing from buildsunknown2008-03-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make mysqld_multi.server executable, and allow it to be installed via chkconfig on LSB-compliant systems. scripts/make_binary_distribution.sh: Adjust permissions on some support-files/* scripts: make mysqld_multi.server executable, and mysql-VERSION.spec not executable. support-files/mysqld_multi.server.sh: Add LSB comments for chkconfig to simplify installation for sysadmins.
* | | | Merge trift2.:/MySQL/M50/man8-5.0unknown2008-03-191-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/man8-5.1 support-files/mysql.spec.sh: Auto merged
| * | | Merge trift2.:/MySQL/M41/man8-4.1unknown2008-03-191-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/man8-5.0 support-files/mysql.spec.sh: Manual merge: Add the man pages for "ndbd" and "ndb_mgmd".
| | * | support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd".unknown2008-03-191-0/+6
| | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Add the man pages for "ndbd" and "ndb_mgmd".
* | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildunknown2008-02-262-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/build/mysql-5.1-build config/ac-macros/misc.m4: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769: Auto merged storage/ndb/src/common/util/SocketServer.cpp: Auto merged
| * | | Makefile.am, Info.plist.sh:unknown2008-02-262-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot misc.m4, character_sets.m4, openssl.m4: Removed unneded semicolon config/ac-macros/character_sets.m4: Removed unneded semicolon config/ac-macros/misc.m4: Removed unneded semicolon config/ac-macros/openssl.m4: Removed unneded semicolon support-files/MacOSX/Info.plist.sh: Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot support-files/MacOSX/Makefile.am: Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
* | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-02-224-0/+410
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged extra/yassl/src/handshake.cpp: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/handler.cc: Auto merged sql/log_event.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp: Auto merged storage/ndb/tools/waiter.cpp: Auto merged
| * \ \ Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1unknown2008-02-114-0/+410
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/ndbapi/DictCache.cpp: Auto merged
| | * | | Makefile.am:unknown2008-01-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to add the new sample configuration files to the CLEANFILES section support-files/Makefile.am: Needed to add the new sample configuration files to the CLEANFILES section
| | * | | config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh:unknown2008-01-234-0/+407
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample cluster configuration files for 5.1 Makefile.am: Updated for new files support-files/config.huge.ini.sh: Sample cluster configuration files for 5.1 support-files/config.medium.ini.sh: Sample cluster configuration files for 5.1 support-files/config.small.ini.sh: Sample cluster configuration files for 5.1 support-files/Makefile.am: Updated for new files
* | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-02-181-1/+73
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/build/51 scripts/mysql_config.sh: Auto merged support-files/mysql.spec.sh: Manual merge
| * | | Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket fileunknown2008-02-181-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for an existing MySQL server package from a different vendor or major MySQL version. In such a case, refuse to install the server and recommend how to safely remove the old packages before installing the new ones. support-files/mysql.spec.sh: Add to the %pre server scriptlet checks to ensure that we're not upgrading from another vendor's package, or that this is not a major version upgrade. If an automatic upgrade isn't safe, print basic instructions on how to do a manual upgrade, and bail out.
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-201-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.1 configure.in: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/Makefile.am: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/key.cc: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.h: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged storage/archive/ha_archive.cc: Auto merged storage/innobase/buf/buf0buf.c: Auto merged storage/innobase/buf/buf0flu.c: Auto merged storage/innobase/buf/buf0lru.c: Auto merged storage/innobase/include/buf0buf.h: Auto merged storage/innobase/include/buf0buf.ic: Auto merged storage/innobase/include/sync0arr.h: Auto merged storage/innobase/include/sync0rw.h: Auto merged storage/innobase/include/sync0rw.ic: Auto merged storage/innobase/include/sync0sync.h: Auto merged storage/innobase/os/os0sync.c: Auto merged storage/innobase/sync/sync0arr.c: Auto merged storage/innobase/sync/sync0rw.c: Auto merged storage/innobase/sync/sync0sync.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged sql/ha_ndbcluster.cc: merged sql/item_cmpfunc.cc: merged sql/protocol.cc: merged sql/slave.cc: merged sql/sql_class.h: merged sql/sql_parse.cc: merged
| * | | ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:unknown2007-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated links to version 5.1 of the manual Docs/INSTALL-BINARY: Updated links to version 5.1 of the manual INSTALL-SOURCE: Updated links to version 5.1 of the manual INSTALL-WIN-SOURCE: Updated links to version 5.1 of the manual support-files/MacOSX/ReadMe.txt: Updated links to version 5.1 of the manual
* | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-143-1/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint CMakeLists.txt: Auto merged configure.in: Auto merged libmysql/CMakeLists.txt: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/t/information_schema.test: Auto merged sql/CMakeLists.txt: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged storage/archive/ha_archive.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged support-files/mysql.spec.sh: Auto merged client/mysqlcheck.c: Manual merge. mysql-test/r/information_schema.result: Manual merge. mysql-test/r/mysqlcheck.result: Manual merge. mysql-test/t/mysqlcheck.test: Manual merge. sql/slave.cc: Manual merge. sql/sql_base.cc: Manual merge. sql/sql_delete.cc: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_update.cc: Manual merge.
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-11-211-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build support-files/compiler_warnings.supp: merge fix
| | * | add wrong warning to suppression fileunknown2007-11-211-0/+1
| | | | | | | | | | | | | | | | | | | | support-files/compiler_warnings.supp: we want that.
| * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-11-211-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build support-files/compiler_warnings.supp: merge fix
| | * | ignore readline warningsunknown2007-11-211-0/+5
| | | | | | | | | | | | | | | | | | | | support-files/compiler_warnings.supp: readline is not maintained by us
| | * | In the "spec" file for RPM builds, handle the debug server tests different ↵unknown2007-11-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the standard server. support-files/mysql.spec.sh: Don't use the "test-bt" target to run the tests on the debug server, rather use "test-bt-debug". There are two reasons for this: 1) Consistency with the "tar.gz" builds. 2) The tool that evaluates the build logs needs unique "--comment=" options in the log, or else it will fail when it generates the test status summary.
| | * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-11-081-0/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
| * | \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-11-081-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
| | * \ \ \ Merge mysql.com:/home/kent/bk/bug25205/mysql-5.0-buildunknown2007-11-021-0/+8
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/bug25205/mysql-5.1-build BitKeeper/deleted/.del-generate-text-files.pl: Auto merged
| | | * | | Makefile.am:unknown2007-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added manual.chm to EXTRA_DIST Removed install of INSTALL-BINARY, handled by install scripts. ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE: Updated links to version 5.0 of the manual Docs/INSTALL-BINARY: Updated links to version 5.0 of the manual INSTALL-SOURCE: Updated links to version 5.0 of the manual INSTALL-WIN-SOURCE: Updated links to version 5.0 of the manual support-files/MacOSX/ReadMe.txt: Updated links to version 5.0 of the manual Docs/Makefile.am: Added manual.chm to EXTRA_DIST Removed install of INSTALL-BINARY, handled by install scripts.
| | | * | | Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-buildunknown2007-11-021-0/+8
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/bug25205/mysql-5.0-build BitKeeper/deleted/.del-generate-text-files.pl: SCCS merged Docs/Makefile.am: SCCS merged
| | | | * | Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0unknown2007-11-021-0/+8
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
| | | | | * | mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am:unknown2007-11-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let place holders for real documentation have text that makes sense to the user (Bug#25205) BitKeeper/deleted/.del-generate-text-files.pl: Delete: Docs/Support/generate-text-files.pl Docs/INSTALL-BINARY: BitKeeper file /home/kent/bk/bug25205/mysql-4.0/Docs/INSTALL-BINARY INSTALL-SOURCE: BitKeeper file /home/kent/bk/bug25205/mysql-4.0/INSTALL-SOURCE support-files/MacOSX/ReadMe.txt: BitKeeper file /home/kent/bk/bug25205/mysql-4.0/support-files/MacOSX/ReadMe.txt Docs/mysql.info: More of a end-user text Docs/Makefile.am: Don't generate text files from the documentation
| * | | | | | Merge production.mysql.com:/usersnfs/jperkin/bk/bug-27995/5.0unknown2007-11-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/build/5.1 support-files/mysql.server.sh: Auto merged
| | * | | | Provide better feedback to the user when unable to find MySQL filesunknown2007-11-051-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usually caused by a bad basedir setting. support-files/mysql.server.sh: Be more verbose in error message.
| | * | | Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to ↵unknown2007-10-1245-1472/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause confusion. BitKeeper/deleted/.del-README.debian: Delete: support-files/debian/README.debian BitKeeper/deleted/.del-changelog~8457b43736642c: Delete: support-files/debian/changelog BitKeeper/deleted/.del-control: Delete: support-files/debian/control BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0: Delete: support-files/debian/copyright BitKeeper/deleted/.del-gomi: Delete: support-files/debian/gomi BitKeeper/deleted/.del-libmysqlclient10.dirs: Delete: support-files/debian/libmysqlclient10.dirs BitKeeper/deleted/.del-libmysqlclient10.postinst: Delete: support-files/debian/libmysqlclient10.postinst BitKeeper/deleted/.del-libmysqlclient9.dirs: Delete: support-files/debian/libmysqlclient9.dirs BitKeeper/deleted/.del-libmysqlclient9.postinst: Delete: support-files/debian/libmysqlclient9.postinst BitKeeper/deleted/.del-move: Delete: support-files/debian/move BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3: Delete: support-files/debian/my.cnf BitKeeper/deleted/.del-mysql-bench.dirs: Delete: support-files/debian/mysql-bench.dirs BitKeeper/deleted/.del-aa: Delete: support-files/debian/patches/aa BitKeeper/deleted/.del-mysql-client.dirs: Delete: support-files/debian/mysql-client.dirs BitKeeper/deleted/.del-mysql-dev.dirs: Delete: support-files/debian/mysql-dev.dirs BitKeeper/deleted/.del-mysql-doc.dirs: Delete: support-files/debian/mysql-doc.dirs BitKeeper/deleted/.del-mysql-max-debug.dirs: Delete: support-files/debian/mysql-max-debug.dirs BitKeeper/deleted/.del-mysql-max-debug.postinst: Delete: support-files/debian/mysql-max-debug.postinst BitKeeper/deleted/.del-mysql-max-debug.postrm: Delete: support-files/debian/mysql-max-debug.postrm BitKeeper/deleted/.del-mysql-max-shared.dirs: Delete: support-files/debian/mysql-max-shared.dirs BitKeeper/deleted/.del-mysql-max-shared.postinst: Delete: support-files/debian/mysql-max-shared.postinst BitKeeper/deleted/.del-mysql-max-shared.postrm: Delete: support-files/debian/mysql-max-shared.postrm BitKeeper/deleted/.del-mysql-max.dirs: Delete: support-files/debian/mysql-max.dirs BitKeeper/deleted/.del-mysql-max.postinst: Delete: support-files/debian/mysql-max.postinst BitKeeper/deleted/.del-mysql-max.postrm: Delete: support-files/debian/mysql-max.postrm BitKeeper/deleted/.del-mysql-server-debug.dirs: Delete: support-files/debian/mysql-server-debug.dirs BitKeeper/deleted/.del-mysql-server-debug.postinst: Delete: support-files/debian/mysql-server-debug.postinst BitKeeper/deleted/.del-mysql-server-debug.postrm: Delete: support-files/debian/mysql-server-debug.postrm BitKeeper/deleted/.del-mysql-server-shared.dirs: Delete: support-files/debian/mysql-server-shared.dirs BitKeeper/deleted/.del-mysql-server-shared.postinst: Delete: support-files/debian/mysql-server-shared.postinst BitKeeper/deleted/.del-mysql-server-shared.postrm: Delete: support-files/debian/mysql-server-shared.postrm BitKeeper/deleted/.del-mysql-server.conffiles: Delete: support-files/debian/mysql-server.conffiles BitKeeper/deleted/.del-mysql-server.dirs: Delete: support-files/debian/mysql-server.dirs BitKeeper/deleted/.del-mysql-server.postinst: Delete: support-files/debian/mysql-server.postinst BitKeeper/deleted/.del-mysql-server.postrm: Delete: support-files/debian/mysql-server.postrm BitKeeper/deleted/.del-mysql-server.prerm: Delete: support-files/debian/mysql-server.prerm BitKeeper/deleted/.del-rules~2018e0de32c6d936: Delete: support-files/debian/rules BitKeeper/deleted/.del-shlibs: Delete: support-files/debian/shlibs BitKeeper/deleted/.del-ab: Delete: support-files/debian/patches/ab BitKeeper/deleted/.del-ac: Delete: support-files/debian/patches/ac BitKeeper/deleted/.del-ad: Delete: support-files/debian/patches/ad BitKeeper/deleted/.del-ae: Delete: support-files/debian/patches/ae BitKeeper/deleted/.del-az: Delete: support-files/debian/patches/az BitKeeper/deleted/.del-ta: Delete: support-files/debian/patches/ta BitKeeper/deleted/.del-tb: Delete: support-files/debian/patches/tb
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-173-4/+17
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge BitKeeper/deleted/.del-ha_berkeley.cc: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged BitKeeper/triggers/post-commit: Auto merged client/mysqlcheck.c: Auto merged include/config-win.h: Auto merged include/my_dbug.h: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/r/information_schema_db.result: Auto merged mysql-test/t/func_in.test: Auto merged mysql-test/t/information_schema.test: Auto merged sql/Makefile.am: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.h: Auto merged sql/sp_head.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_view.cc: Auto merged sql/structs.h: Auto merged sql/table.h: Auto merged storage/archive/ha_archive.cc: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/mi_open.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/ndb/src/common/util/File.cpp: Auto merged configure.in: Manual merge. sql/CMakeLists.txt: Manual merge. sql/mysql_priv.h: Manual merge. sql/mysqld.cc: Manual merge. sql/set_var.cc: Manual merge. sql/slave.cc: Manual merge. sql/sql_cache.cc: Manual merge. sql/sql_class.cc: Manual merge. sql/sql_lex.h: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_select.cc: Manual merge. sql/sql_show.cc: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_update.cc: Manual merge. sql/sql_yacc.yy: Manual merge.
| * | | | Makefile.am, make_binary_distribution.sh:unknown2007-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use custom 'pkgduppdir' mysql.server.sh: The server is installed in 'libexecdir' scripts/Makefile.am: Use custom 'pkgduppdir' scripts/make_binary_distribution.sh: Use custom 'pkgduppdir' support-files/mysql.server.sh: The server is installed in 'libexecdir'
| * | | | make_binary_distribution.sh:unknown2007-09-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'make install' to create the package Makefile.am: Added 'pkgsuppdir' to control location separately Pass on mandir and infodir Don't install headers scripts/Makefile.am: Pass on mandir and infodir scripts/make_binary_distribution.sh: Use 'make install' to create the package support-files/Makefile.am: Added 'pkgsuppdir' to control location separately cmd-line-utils/readline/Makefile.am: Don't install headers cmd-line-utils/libedit/Makefile.am: Don't install headers
| * | | | Merge trift2.:/MySQL/M50/bug21023-25486-5.0unknown2007-07-171-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/bug21023-25486-5.1 mysql-test/Makefile.am: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/Makefile.am: SCCS merged
| | * | | Handle "support-files/mysqld_multi.server.sh" like other shell scripts.unknown2007-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing bug#25486: mysqld_multi.server.sh missing from builds support-files/Makefile.am: Handle "mysqld_multi.server.sh" like other shell scripts. Fixing bug#25486.
| * | | | Added casts to avoid compiler warnings and fixed a wrong type.unknown2007-05-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --- Added casts and fixed wrong type. --- Added casts and fixed wrong type. --- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel --- Don't give warning that readonly variable is forced to be readonly mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file Fixed wrong reference to the mysql manual Fixed wrong prototype that caused some tests to fail on 64 bit platforms --- Disabled compiler warnings mainly for Win 64. --- Added casts to remove compiler warnings on windows Give warnings also for safe_mutex errors found by test system Added some warnings from different machines in pushbuild --- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel into mysql.com:/home/my/mysql-5.1 --- Added escapes for double quotes and parenthesis. --- Archive db fix plus added non-critical warnings in ignore list. --- Fixed previously added patch and added new ignored warning. client/mysqltest.c: Added casts to avoid compiler warnings. --- Added casts to avoid compiler warnings. mysql-test/lib/mtr_report.pl: Test run now fails if we have [Warning] and [ERROR] as tags in .err file Added list of all common 'not fatal' errors to ignore error list --- Give warnings also for safe_mutex errors Added some warnings from different machines in pushbuild --- Added escapes for double quotes and parenthesis. --- Added non-critical warnings to be ignored. --- Fixed a wrong regexp Added new non-critical warning mysql-test/mysql-test-run-shell.sh: Fixed some wrong startup options mysql-test/r/func_misc.result: Test case for archive db fix. mysql-test/t/disabled.def: Disable instance manager tests because they generate warnings (and probably don't read the option files correctly) mysql-test/t/func_misc.test: Test case for archive db fix. mysys/array.c: Added casts to avoid compiler warnings. mysys/hash.c: Added casts to avoid compiler warnings. mysys/my_compress.c: Added casts to remove compiler warnings on windows mysys/my_conio.c: To avoid a warning from compiler. mysys/my_pread.c: Archive db fix. mysys/my_quick.c: Added cast to avoid compiler warning. --- Added cast to avoid compiler warning. sql/ha_ndbcluster_binlog.cc: Ensure we log all binglog errors with the "NDB Binlog" tag sql/ha_partition.cc: result is type bool, so calculation should be forced to that also. sql/log.cc: Fixed compiler problem on Solaris. sql/slave.cc: Make errors uniform sql/sql_class.cc: Added cast to remove compiler warnings on windows sql/sql_map.cc: Added casts to avoid compiler warnings. --- Added casts to avoid compiler warnings. sql/sql_plugin.cc: Fixed wrong type. --- Don't give warning that readonly variable is forced to be readonly sql/stacktrace.c: Corrected manual reference storage/archive/azio.c: Archive db fix. --- Fixed previously added patch. storage/blackhole/ha_blackhole.cc: Fixed wrong prototype that caused test to fail on 64 bit platforms storage/example/ha_example.cc: Fixed wrong prototype that caused test to fail on 64 bit platforms strings/ctype-ucs2.c: Fixed wrong type. --- Fixed wrong type. support-files/compiler_warnings.supp: Added new disabled warnings for Win 64.
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02unknown2007-05-071-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification configure.in: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/r/information_schema.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_view.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.h: Auto merged support-files/mysql.spec.sh: Auto merged sql/Makefile.am: SCCS merged
| * | | | "ndb_size.tmpl" is gone (NDB change 2007-04-24), so remove it from the spec ↵unknown2007-05-021-1/+5
| | | | | | | | | | | | | | | | | | | | file.
| * | | | Merge trift2.:/MySQL/M50/spec-5.0unknown2007-05-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/spec-5.1 support-files/mysql.spec.sh: Auto merged
| | * | | Merge trift2.:/MySQL/M41/spec-4.1unknown2007-05-021-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/spec-5.0 support-files/mysql.spec.sh: SCCS merged
View Lorry Controller Status