summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194unknown2006-08-241-0/+3
|\ | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint support-files/mysql.spec.sh: Auto merged
| * mysql.spec.sh:unknown2006-08-221-0/+1
| | | | | | | | | | | | | | | | Added ndb_error_reporter to the RPM install (bug#20426) support-files/mysql.spec.sh: Added ndb_error_reporter to the RPM install (bug#20426)
| * Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194unknown2006-08-221-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194 support-files/mysql.spec.sh: Auto merged
| | * mysql.spec.sh:unknown2006-08-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Added ndb_size.{pl,tmpl} to the RPM install (bug#20426) support-files/mysql.spec.sh: Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
* | | Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_mergeunknown2006-07-291-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge configure.in: Auto merged man/Makefile.am: Auto merged mysys/my_bitmap.c: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/field.cc: Auto merged sql/sql_locale.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/t/mysqlbinlog.test: Manual merge. sql/sql_select.cc: Manual merge.
| * \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0unknown2006-07-281-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1 configure.in: Auto merged scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: SCCS merged
| | * | | mysql.spec.sh:unknown2006-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Man page for "mysqld" command move to section 8 (bug#21220) support-files/mysql.spec.sh: Man page for "mysqld" command move to section 8 (bug#21220)
* | | | | Merge trift2.:/M41/tmp_mergeunknown2006-07-241-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/M50/merge-4.1-to-5.0 mysql-test/r/date_formats.result: Auto merged mysql-test/t/date_formats.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_locale.cc: Auto merged sql/item_timefunc.cc: Merging by "ul", as asked in the original changeset. support-files/mysql.spec.sh: Manual merge, keeping alphabetic order.
| * | | | mysql.spec.sh:unknown2006-07-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new "mysql_explain_log" man page Added missing install of "myisam_ftdump" man page Added missing install of "mysqlman" man page support-files/mysql.spec.sh: Added new "mysql_explain_log" man page Added missing install of "myisam_ftdump" man page Added missing install of "mysqlman" man page
* | | | | Merge trift2.:/M41/tmp_mergeunknown2006-07-241-1/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | into trift2.:/M50/merge-4.1-to-5.0 support-files/mysql.spec.sh: Auto merged configure.in: Manual - "use local".
| * | | mysql.spec.sh:unknown2006-07-151-1/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058) support-files/mysql.spec.sh: Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
| * | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-07-051-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M41/bug20216-4.1 support-files/mysql.spec.sh: Auto merged
* | | | support-files/mysql.spec.sh : Fix a typing error.unknown2006-07-101-2/+6
| | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Fix a typing error in the "make" target for the Perl script to run the tests.
* | | | When building RPMs, use the Perl script to run the tests, to automatically ↵unknown2006-07-041-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check SSL. support-files/mysql.spec.sh: Use the Perl script to run the tests, because it will automatically check whether the server is configured with SSL. (The shell script needs an explicit flag, and we cannot pass that though "make".)
* | | | mysql.spec.sh:unknown2006-06-301-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable old RPM strip my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) mysqlmanager.vcproj: Place output files in common release/debug directory server-tools/instance-manager/mysqlmanager.vcproj: Place output files in common release/debug directory include/my_global.h: Fixed wrong cast, which caused problems with gcc 4.0 and floats in prepared statements (Bug #19694) support-files/mysql.spec.sh: Disable old RPM strip
* | | | Manual merge for bug#20216.unknown2006-06-271-1/+3
|\ \ \ \ | | |/ / | |/| | | | | | | | | | support-files/mysql.spec.sh: Manual merge for bug#20216, due to some conflict in the changenotes.
| * | | Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216),unknown2006-06-271-1/+5
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | manual merge from 4.0. support-files/mysql.spec.sh: Manual merge of the fix for bug#20216. (became necessary because 4.0 and 4.1 spec files use different file sort order).
| | * | Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).unknown2006-06-271-1/+5
| | | |
* | | | Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.unknown2006-06-271-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes bug#18516, as far as "generic RPMs" are concerned. support-files/mysql.spec.sh: Revert all previous attempts to call "mysql_upgrade" during RPM upgrade, there are some more aspects which need to be solved before this is possible. For now, just ensure the binary "mysql_upgrade" is delivered and installed. This finishes bug#18516, as far as "generic RPMs" are concerned.
* | | | Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0unknown2006-06-271-4/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: Auto merged
| * | | | Improved fix for bug#18516 (also 19353):unknown2006-06-221-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Rename the old shell tool "mysql_upgrade", to avoid a name collision. 2) Improve the spec file, to explicitly use a temporary socket. scripts/mysql_upgrade_shell.sh: Rename: scripts/mysql_upgrade.sh -> scripts/mysql_upgrade_shell.sh scripts/Makefile.am: The old shell script "mysql_upgrade" must be renamed, so that its name does not collide with the new binary. support-files/mysql.spec.sh: The previous version was incomplete, as it did not cover the case where the DBA had configured a non-default socket file. Solve that by creating and explicitly providing a temporary directory for the socket just for the duration of "mysql_upgrade", which also can be better protected than the default socket.
* | | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlunknown2006-06-231-0/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into moonbone.local:/work/tmp_merge-5.0-opt-mysql mysql-test/r/key.result: Auto merged mysql-test/t/key.test: Auto merged sql/table.cc: Auto merged support-files/mysql.spec.sh: Auto merged
| * | | mysql.spec.sh:unknown2006-06-231-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Disable the simplistic auto dependency scan for test/bench (bug#20078) support-files/mysql.spec.sh: Disable the simplistic auto dependency scan for test/bench (bug#20078)
| * | Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1unknown2006-06-141-0/+1
| |\ \
* | | | Fix for bug#18516 (also #19353, reported for 5.1):unknown2006-06-202-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to include "mysql_upgrade" in a RPM, it should also be called when the RPM is upgraded. support-files/mysql.server.sh: Support getting additional arguments, which need to be passed on to the server. This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments. So if the IM would be used, additional arguments cause the start to fail (voluntarily). This feature is needed so that tools like RPM can start the server in an "isolated" way, see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade". support-files/mysql.spec.sh: Call "mysql_upgrade" during an RPM upgrade. "mysql_upgrade" needs a server to run, as it issues SQL commands. (This had been neglected previously.) It also needs to connect as "root", but in an RPM upgrade the password is unknown. To allow this, the server is started "--skip-grant-tables". Normally, this would open big security holes, so it is also started "--skip-networking", and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
* | | | Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0unknown2006-06-141-0/+1
|\ \ \ \
| * \ \ \ Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0unknown2006-06-141-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | support-files/mysql.server.sh: Auto merged
| | * | | support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + ↵unknown2006-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#20118 support-files/mysql.server.sh: Ensure that some necessary / useful system services have been started already, when the MySQL server is started. This fixes bug#18810 and bug#20118
* | | | | Mergeunknown2006-05-211-0/+5
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Mergeunknown2006-05-201-0/+5
| |\ \ \ | | |/ / | |/| / | | |/ | | | support-files/mysql.spec.sh: SCCS merged
| | * mysql.spec.sh:unknown2006-05-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Always compile position independent support-files/mysql.spec.sh: Always compile position independent
| * | Merge jonas@perch:src/mysql-4.1unknown2006-05-161-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 support-files/mysql.spec.sh: Auto merged
| | * \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-05-081-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 support-files/mysql.spec.sh: Auto merged
* | | \ \ Merge jonas@perch:src/mysql-5.0unknown2006-05-161-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 support-files/mysql.spec.sh: Auto merged
| * \ \ \ \ Mergeunknown2006-05-101-1/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | mysql.spec.sh:unknown2006-05-101-1/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile in all character sets in Max (bug#14918) support-files/mysql.spec.sh: Compile in all character sets in Max (bug#14918)
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 support-files/mysql.spec.sh: Auto merged ndb/src/mgmsrv/Services.cpp: merge
| * | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-04-261-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/mgmsrv/Services.cpp: Auto merged
| | * \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-04-261-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/include/util/SocketServer.hpp: Auto merged ndb/src/common/transporter/Transporter.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged support-files/mysql.spec.sh: Auto merged
| | | * | | Add ndb_config to rpm specunknown2006-04-261-0/+1
| | | | | |
* | | | | | Mergeunknown2006-05-011-24/+20
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | include/config-win.h: Auto merged
| * | | | | mysql.spec.sh:unknown2006-05-011-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "./libtool --mode=execute" to find real path to executables support-files/mysql.spec.sh: Use "./libtool --mode=execute" to find real path to executables
| * | | | | mysql.spec.sh:unknown2006-04-291-15/+57
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of changes in 5.0 (bug#18294) support-files/mysql.spec.sh: Backport of changes in 5.0 (bug#18294)
* | | | | mysql.spec.sh:unknown2006-04-281-1/+10
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Include and run mysql_upgrade if needed (bug#19353) support-files/mysql.spec.sh: Include and run mysql_upgrade if needed (bug#19353)
* | | | Fix for Bug #16240unknown2006-04-061-2/+10
| |/ / |/| | | | | | | | | | | | | | support-files/mysql.server.sh: Fixed so that if the datadir has been set via the command line, it won't be reset by specifing the basedir after.
* | | Mergeunknown2006-04-011-0/+5
|\ \ \ | |/ /
| * | Makefile.am:unknown2006-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let "make install" install mysql-test-run.pl mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) support-files/mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) mysql-test/Makefile.am: Let "make install" install mysql-test-run.pl
* | | mysql.spec.sh:unknown2006-03-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Use installed libz.a to avoid hard to solve static linking problems support-files/mysql.spec.sh: Use installed libz.a to avoid hard to solve static linking problems
* | | mysql.spec.sh:unknown2006-03-031-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | Don't create empty embedded RPM, bug#15769 support-files/mysql.spec.sh: Don't create empty embedded RPM, bug#15769
* | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-02-131-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/M50/rpmspec-5.0
View Lorry Controller Status