summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Collapse)AuthorAgeFilesLines
* Fixed Bug#7873.unknown2005-02-171-1/+4
|
* Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-02-171-1/+1
|\ | | | | | | | | support-files/mysql.spec.sh: Auto merged
| * - fixed a changelog entry in the RPM spec file (wrong author)unknown2005-02-171-1/+1
| | | | | | | | | | support-files/mysql.spec.sh: - fixed a changelog entry (wrong author)
* | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-02-171-2/+8
|\ \ | |/ | | | | | | | | | | mysql-test/mysql-test-run.pl: Auto merged support-files/mysql.spec.sh: Auto merged
| * - fixed the compilation commentsunknown2005-02-141-2/+8
| | | | | | | | | | | | | | - fixed a broken changelog entry
* | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2005-02-071-8/+7
|\ \ | |/ | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 support-files/mysql.spec.sh: Auto merged
| * mysql.spec.sh:unknown2005-02-071-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | removed typo moved pre to post for directory creation add changelog comments support-files/mysql.spec.sh: removed typo moved pre to post for directory creation add changelog comments
* | Merge mysql.com:/home/mysqldev/tulin/mysql-4.1unknown2005-02-032-3/+6
|\ \ | |/ | | | | | | | | | | into mysql.com:/home/mysqldev/tulin/mysql-5.0
| * made an .sh file of ndb-config-2-node.ini insteadunknown2005-02-032-3/+6
| | | | | | | | | | support-files/ndb-config-2-node.ini.sh: Rename: support-files/ndb-config-2-node.ini -> support-files/ndb-config-2-node.ini.sh
* | Merge mysql.com:/home/mysqldev/tulin/mysql-4.1unknown2005-02-032-0/+137
|\ \ | |/ | | | | | | | | | | | | into mysql.com:/home/mysqldev/tulin/mysql-5.0 support-files/mysql.spec.sh: Auto merged
| * ndbcluster rpmsunknown2005-02-032-0/+137
| |
* | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-01-201-3/+10
|\ \ | |/
| * - small improvement for the logrotate config file (patch found in the SUSEunknown2005-01-181-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | source RPM): use "mysqladmin ping" instead of grepping the process list for the mysqld binary (should be more portable than relying on the "ps" options support-files/mysql-log-rotate.sh: - small improvement (patch found in the SUSE source RPM): use "mysqladmin ping" instead of grepping the process list for the mysqld binary (should be more portable than relying on the "ps" options
* | Mergeunknown2005-01-161-1/+5
|\ \
| * \ Merge with global treeunknown2005-01-151-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union Build-tools/Do-compile: Auto merged configure.in: Auto merged innobase/include/row0mysql.h: Auto merged innobase/os/os0file.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_ujis.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/type_float.result.es: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/show_check.test: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged sql/sql_show.cc: No changes strings/ctype-cp932.c: No changes support-files/mysql.spec.sh: No changes
| | * \ Merge with 4.1unknown2005-01-152-11/+23
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union Build-tools/Do-compile: Auto merged client/mysqladmin.cc: Auto merged heap/hp_create.c: Auto merged heap/hp_write.c: Auto merged include/my_sys.h: Auto merged innobase/data/data0type.c: Auto merged innobase/include/row0mysql.h: Auto merged innobase/os/os0file.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_ujis.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_sapdb.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/type_float.result.es: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/r/type_timestamp.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_sapdb.test: Auto merged mysql-test/t/show_check.test: Auto merged mysql-test/t/type_float.test: Auto merged mysql-test/t/type_timestamp.test: Auto merged mysys/mf_iocache.c: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged scripts/mysql_install_db.sh: Auto merged sql/field.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/item_sum.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-bin.c: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-latin1.c: Auto merged strings/ctype-mb.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-tis620.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged configure.in: Use local values mysql-test/r/ps_1general.result: Update results mysql-test/t/func_gconcat.test: no changes mysql-test/t/ps_1general.test: Use local code ndb/src/common/util/version.c: Use local code sql/filesort.cc: Empty line changes sql/ha_heap.cc: Merge sql/item_timefunc.cc: Keep local code sql/mysql_priv.h: Update to 5.0 sql/sql_show.cc: Hand merge support-files/mysql.spec.sh: No changes
| | | * - replaced obsoleted "BuildPrereq" with "BuildRequires" in the RPM spec fileunknown2005-01-141-1/+5
| | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh: - replaced obsoleted "BuildPrereq" with "BuildRequires" instead
* | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-135-8/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mysql_src/mysql-5.0-clean sql/mysqld.cc: Auto merged
| * | | Encourage user to specify a name for the binlog index file (either by giving ↵unknown2005-01-115-8/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an argument to --log-bin, or by using --log-bin-index). This is so that he does not have a replication break when his master's hostname changes. Plus binary logging options consistency checks. sql/mysqld.cc: * Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin, or by using --log-bin-index). This is so that he does not have a replication break when his master's hostname changes. Why not a fatal error? To not break existing many-machine setups. * --log-bin-index without --log-bin does not make sense. * --log-slave-updates without --log-bin does not either. support-files/my-huge.cnf.sh: encourage providing an argument to log-bin support-files/my-innodb-heavy-4G.cnf.sh: encourage providing an argument to log-bin support-files/my-large.cnf.sh: encourage providing an argument to log-bin support-files/my-medium.cnf.sh: encourage providing an argument to log-bin support-files/my-small.cnf.sh: encourage providing an argument to log-bin
* | | - added the 4.1 shared client libraries to the 5.0 shared-compat RPMunknown2005-01-131-9/+13
| | | | | | | | | | | | | | | | | | | | | (we should consider dropping 3.23 from this one soon)
* | | Merge mysql.com:/space/my/mysql-4.1unknown2005-01-131-10/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build
| * | - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPMunknown2005-01-131-10/+18
| | |
* | | - added option "--with-federated" to Do-compile to enable building of theunknown2005-01-131-0/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | Federated Storage Engine (as requested by Brian) - added the federated storage engine to the Max Linux RPM Build-tools/Do-compile: - added option "--with-federated" to enable building of the Federated Storage Engine (as requested by Brian) support-files/mysql.spec.sh: - enabled the federated storage engine for the Max RPM subpackage
* | Mergeunknown2005-01-041-3/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/t/multi_update.test: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.spec.sh: SCCS merged
| * \ Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-3/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Makefile.am: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged innobase/log/log0recv.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/func_time.test: Auto merged ndb/include/ndb_global.h.in: Auto merged ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged sql/ha_ndbcluster.h: Auto merged sql/item_timefunc.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/set_var.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/time.cc: Auto merged innobase/row/row0upd.c: Trivial merge mysql-test/t/func_concat.test: Keep local code mysql-test/t/multi_update.test: auto merge sql/ha_ndbcluster.cc: manual merge sql/item_timefunc.cc: manual merge sql/mysql_priv.h: manual merge sql/sql_class.h: manual merge sql/sql_delete.cc: manual merge sql/sql_insert.cc: manual merge sql/sql_lex.cc: manual merge sql/sql_lex.h: manual merge sql/sql_load.cc: manual merge sql/sql_parse.cc: manual merge sql/sql_table.cc: manual merge sql/sql_update.cc: manual merge
| | * - added the "Archive", "CSV" and "Example" storage engines to the Linuxunknown2004-12-311-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | "Max" RPM support-files/mysql.spec.sh: - added the "Archive", "CSV" and "Example" storage engines to the Max RPM
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-041-7/+5
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/users/pchardin/mysql-5.0
| * | fixed .spec file after isam/merge purge, removed man pages for isamlog and ↵unknown2005-01-041-7/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | isamchk BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Delete: man/isamchk.1.in BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Delete: man/isamlog.1.in man/Makefile.am: man pages for isamchk and isamlog removed support-files/mysql.spec.sh: fix .spec file after isam/merge purge
* | Many files:unknown2005-01-011-2/+0
|/ | | | | | | | | | | | | | | | | | | | Removed references to ISAM and MERGE netware/BUILD/compile-linux-tools: Removed references to ISAM and MERGE netware/Makefile.am: Removed references to ISAM and MERGE os2/ChangeLog.os2: Removed references to ISAM and MERGE os2/MySQL-Source.icc: Removed references to ISAM and MERGE os2/MySQL-Sql.icc: Removed references to ISAM and MERGE os2/MySQL-Util.icc: Removed references to ISAM and MERGE support-files/debian/gomi: Removed references to ISAM and MERGE
* my-innodb-heavy-4G.cnf.sh:unknown2004-12-171-1/+1
| | | | | | | | | | | | | I fixed the typos in the transaction-isolation comments. I fixed the spelling mistakes in the comment. It had tripped up a support customer as they couldn't start the server with transaction-isolation= read-commited support-files/my-innodb-heavy-4G.cnf.sh: I fixed the typos in the transaction-isolation comments. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Added possibility to use [GNR...] optional argument forunknown2004-10-091-12/+15
| | | | | | | mysqld_multi via mysqld_multi.server.sh
* Added some extra information to output in case --verboseunknown2004-10-091-0/+38
| | | | | | | was given.
* - typo fix - make sure to include an existing file in the sourceunknown2004-08-261-1/+1
| | | | | | | distribution...
* mergedunknown2004-08-261-2/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqladmin.c: Auto merged BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlmanager-pwgen.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged extra/resolveip.c: Auto merged include/my_getopt.h: Auto merged innobase/buf/buf0rea.c: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/Makefile.am: Auto merged myisam/mi_test1.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged tools/mysqlmanager.c: Auto merged
| * - Updated RPM spec file: MySQL-Max now requires MySQL-server insteadunknown2004-08-261-2/+7
| | | | | | | | | | | | | | of MySQL (BUG#3860)
* | manually mergedunknown2004-08-241-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union mysql-test/r/binary.result: Auto merged mysql-test/r/truncate.result: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/t/truncate.test: Auto merged mysys/my_lib.c: Auto merged strings/my_vsnprintf.c: Auto merged support-files/Makefile.am: Auto merged
| * - make sure to recreate all autoconf/automake-related files afterunknown2004-08-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | modifying configure.in for the commercial tarballs - added my-innodb-heavy-4G.cnf to the distribution Build-tools/mysql-copyright: - make sure to recreate all autoconf/automake-related files after modifying configure.in support-files/Makefile.am: - added my-innodb-heavy-4G.cnf to the distribution
* | - do not link statically on our IA64 and AMD64 build hosts, asunknown2004-08-201-16/+23
| | | | | | | | | | | | | | | | | | | | static linking against an unpatched glibc 2.3 is causing trouble - add "glibc23" to the release suffix in this case - re-ordered the Changelog that was messed up by a BK merge (RPM is picky about this)
* | manually mergedunknown2004-08-182-8/+32
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/mysql-copyright: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql: Auto merged VC++Files/innobase/innobase.dsp: Auto merged client/mysql.cc: Auto merged include/my_global.h: Auto merged innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/mtr0log.h: Auto merged innobase/include/mtr0log.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0dbg.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/ut/ut0dbg.c: Auto merged innobase/ut/ut0mem.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/Makefile.shared: Auto merged libmysql/conf_to_src.c: Auto merged libmysql/dll.c: Auto merged libmysql/errmsg.c: Auto merged libmysql/manager.c: Auto merged libmysql_r/Makefile.am: Auto merged myisam/mi_key.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_float.result: Auto merged mysql-test/t/having.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_float.test: Auto merged mysql-test/t/type_uint.test: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/Makefile.am: Auto merged sql/field.h: Auto merged sql/ha_heap.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_sum.h: Auto merged sql/lock.cc: Auto merged sql/log.cc: Auto merged sql/protocol.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged
| * - Fixed two small version number issues in MySQL-shared-compat.specunknown2004-08-121-2/+2
| | | | | | | | | | | | support-files/MySQL-shared-compat.spec.sh: - fixed using the correct version number - bumped up the 3.23 version number to current
| * - Added libmygcc.a to the "devel" RPM subpackage (required to linkunknown2004-08-101-1/+20
| | | | | | | | | | | | | | | | applications against the the embedded server libmysqld.a) (BUG#4921)
| * - added EXCEPTIONS-CLIENT to the "devel" RPM subpackage and addedunknown2004-08-091-1/+6
| | | | | | | | | | | | | | a note to the RPM ChangeLog about it
| * - rename: EXCEPTIONS->EXCEPTIONS-CLIENTunknown2004-08-051-1/+1
| |
| * - applied the required changes to create the FOSS License exceptionunknown2004-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file "EXCEPTIONS" and include it in the source and binary distributions Build-tools/mysql-copyright: - remove COPYING and EXCEPTIONS from the commercial packages Docs/Makefile.am: - create the EXCEPTIONS file that includes the FOSS License exception scripts/make_binary_distribution.sh: - include EXCEPTIONS in the binary distribution, too. support-files/mysql.spec.sh: - add EXCEPTIONS to the server RPM
* | - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql linkunknown2004-07-301-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | flags to enable static linking (to avoid having a shared lib dependency in the Linux RPMs) - Disabled OpenSSL in the Max RPM sql/Makefile.am: - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link flags to enable static linking (to avoid having a shared lib dependency in the Linux Server RPMs) support-files/mysql.spec.sh: - Disable OpenSSL in the Max RPM
* | - fixed file name of the MySQL startup item script to MySQLCOM,unknown2004-07-141-1/+1
| | | | | | | | | | | | | | so it's included in the source distribution
* | - Fixed a previous modification to the MySQL Startup Item for unknown2004-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mac OS X: the name of the startup script itself must match the name of the subdirectory it's located in. Changed MySQL->MySQLCOM in the Do-pkg script and renamed the file in BK. (Thanks to Bryan McCormack for reporting this) Build-tools/Do-pkg: - renamed script from MySQL to MySQLCOM to match the name of the directory it's installed in support-files/MacOSX/MySQLCOM: - Fixed the file and directory name to match the actual location
* | - fixed server RPM postinstall (mysql_install_db was called with theunknown2004-06-301-1/+6
| | | | | | | | | | | | | | wrong parameter)
* | - added mysql_tzinfo_to_sql to binary distributionsunknown2004-06-241-1/+7
| | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: - added mysql_tzinfo_to_sql to binary distribution support-files/mysql.spec.sh: - added mysql_tzinfo_to_sql to the server subpackage - run "make clean" instead of "make distclean"
* | Merge with 4.0.21unknown2004-06-186-17/+17
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/mysql-copyright-2: Auto merged include/violite.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0mem.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/fut/fut0lst.c: Auto merged innobase/ha/hash0hash.c: Auto merged innobase/include/buf0buf.ic: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/data0data.h: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/dict0mem.h: Auto merged innobase/include/fsp0fsp.h: Auto merged innobase/include/hash0hash.h: Auto merged innobase/include/lock0lock.h: Auto merged innobase/include/log0log.h: Auto merged innobase/include/log0log.ic: Auto merged innobase/include/mem0dbg.ic: Auto merged innobase/include/mem0pool.h: Auto merged innobase/include/mtr0mtr.h: Auto merged innobase/include/sync0rw.h: Auto merged innobase/include/sync0sync.h: Auto merged innobase/include/trx0roll.h: Auto merged innobase/include/trx0trx.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0dbg.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/mtr/mtr0mtr.c: Auto merged innobase/pars/lexyy.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/que/que0que.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0upd.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/sync/sync0rw.c: Auto merged innobase/sync/sync0sync.c: Auto merged innobase/thr/thr0loc.c: Auto merged innobase/trx/trx0purge.c: Auto merged innobase/trx/trx0roll.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/usr/usr0sess.c: Auto merged innobase/ut/ut0mem.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysys/mf_tempfile.c: Auto merged netware/BUILD/nwbootstrap: Auto merged netware/Makefile.am: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.cc: Auto merged mysql-test/t/func_if.test: Auto merged sql/mysqld.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged Build-tools/Do-compile: Merge with 4.0 Build-tools/mysql-copyright: Merge with 4.0 client/mysqltest.c: Merge with 4.0 include/my_global.h: Merge with 4.0 innobase/buf/buf0rea.c: Merge with 4.0 innobase/data/data0type.c: Merge with 4.0 innobase/ibuf/ibuf0ibuf.c: Merge with 4.0 innobase/include/buf0buf.h: Merge with 4.0 innobase/include/data0type.h: Merge with 4.0 innobase/include/mem0mem.h: Merge with 4.0 innobase/include/mem0mem.ic: Merge with 4.0 innobase/log/log0recv.c: Merge with 4.0 libmysql/libmysql.c: Merge with 4.0 libmysqld/Makefile.am: Merge with 4.0 mysql-test/r/range.result: Merge with 4.0 mysql-test/r/type_decimal.result: Merge with 4.0 mysql-test/t/range.test: Merge with 4.0 netware/BUILD/mwenv: Merge with 4.0 netware/mysql_test_run.c: Merge with 4.0 scripts/mysql_install_db.sh: Merge with 4.0 sql/field.cc: Merge with 4.0 sql/field.h: Merge with 4.0 sql/item_cmpfunc.h: Merge with 4.0 support-files/my-huge.cnf.sh: Merge with 4.0 support-files/my-large.cnf.sh: Merge with 4.0 support-files/my-medium.cnf.sh: Merge with 4.0 support-files/my-small.cnf.sh: Merge with 4.0 support-files/mysql.spec.sh: Merge with 4.0