summaryrefslogtreecommitdiff
path: root/support-files/my-innodb-heavy-4G.cnf.sh
Commit message (Collapse)AuthorAgeFilesLines
* merge with 5.3Sergei Golubchik2011-10-191-24/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * Merge with MySQL 5.1.55Michael Widenius2011-02-201-26/+27
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria" - Fixed wrong assert in Aria Now need to merge with latest xtradb before pushing sql/ha_partition.cc: Ensure that m_ordered_rec_buffer is not freed before close. sql/mysqld.cc: Changed to use opt_stack_trace instead of opt_pstack. Removed references to pstack sql/partition_element.h: Ensure that connect_string is initialized storage/maria/ma_key_recover.c: Fixed wrong assert
* | \ 5.5-mergeSergei Golubchik2011-07-021-13/+5
|\ \ \
| * \ \ mergeGeorgi Kodinov2010-11-191-13/+5
| |\ \ \ | | | |/ | | |/|
| | * | Bug #50021: Windows standard configuration files are showing Linux Georgi Kodinov2010-11-181-13/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options/settings 1. Changed the default value for socket on Windows to the windows default 2. Removed hard-coded trailing slashes from innodb_data_home_dir and innodb_log_group_name_dir. 3. Added extra backslashes to the innodb directory example 4. Made the tempdir platform "dependent" 5. Fixed the comments in the .ini files 6. Removed the tmpdir from the templates and the scripts
* | | | merge.Sergei Golubchik2010-11-251-1/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | checkpoint. does not compile.
| * | 5.1.51 mergeSergei Golubchik2010-10-191-10/+10
| |\ \ | | |/
| * | MBUG#452116: MariaDB: mysql_install_db causes server segfaultSergey Petrunya2009-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Increase thread_stack_size on 64-bit platforms to 240K, so that it can accomodate the HA_CHECK structure which is 130K.
* | | mergeGeorgi Kodinov2010-08-061-10/+10
|\ \ \ | | |/ | |/|
| * | Bug #54909: Confusing description about read_buffer_size andGeorgi Kodinov2010-08-061-10/+10
| |/ | | | | | | | | | | | | read_rnd_buffer_size Applied the updated description from Paul's patch.
* | Merged in 5.1.35Mikael Ronstrom2009-07-011-2/+3
|\ \ | |/ |/|
| * Bug#44470 innodb_file_io_threads precludes mysql from startingAlexey Botchkov2009-06-041-2/+3
| | | | | | | | | | | | | | | | | | the innodb_file_io_threads option isn't present here. Changed with the innodb_read/write_io_threads per-file comments: support-files/my-innodb-heavy-4G.cnf.sh
* | Bug#34521, removed a bunch of deprecated options from template my.cnf files.Daniel Fischer2009-03-311-23/+5
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged from 5.0 version of this patch: - Removed entire isamchk section. Support for ISAM tables was removed in 5.0. - Replaced key_buffer with key_buffer_size (correct spelling). - Removed skip-bdb, as BDB is no longer included in 5.0 and above. - Removed commented-out bdb_cache_size and bdb_max_lock for the same reason. - Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24. - Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. - Removed log_long_format, deprecated in 4.1. - Replaced default_table_type with default-storage-engine. New in 5.1: - Replaced table_cache with table_open_cache. - Removed skip-federated, should have been in 5.0 only. - Replaced log_slow_queries with slow_query_log, deprecated in 5.1.29.
| * Bug#34521, removed a bunch of deprecated options from template my.cnf files:Daniel Fischer2009-03-311-28/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Removed entire isamchk section. Support for ISAM tables was removed in 5.0. - Replaced key_buffer with key_buffer_size (correct spelling). - Removed skip-bdb, as BDB is no longer included in 5.0 and above. - Removed commented-out bdb_cache_size and bdb_max_lock for the same reason. - Removed commented-out innodb_log_arch_dir, deprecated in 5.0.24. - Removed myisam_max_extra_sort_file_size, deprecated in 5.0.6. - Removed log_long_format, deprecated in 4.1. - Replaced default_table_type with default-storage-engine.
| * Use skip-federated by default in all example configs.Jonathan Perkin2008-06-101-0/+3
| |
* | Bug #39812: Make statement replication default for 5.1 (to match 5.0)Georgi Kodinov2008-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make STMT replication default for 5.1. Add a default of MIXED into the config files Fix the tests that needed MIXED replication mode. mysql-test/include/mix1.inc: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/r/innodb-semi-consistent.result: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/r/innodb.result: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/r/innodb_mysql.result: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/r/tx_isolation_func.result: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/t/innodb-semi-consistent.test: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/t/innodb.test: Bug #39812: Fix the tests that needed MIXED replication mode. mysql-test/t/tx_isolation_func.test: Bug #39812: Fix the tests that needed MIXED replication mode. sql/mysqld.cc: Bug #39812: Make STMT replication default for 5.1. support-files/my-huge.cnf.sh: Bug #39812: Add a default of MIXED into the config files support-files/my-innodb-heavy-4G.cnf.sh: Bug #39812: Add a default of MIXED into the config files support-files/my-large.cnf.sh: Bug #39812: Add a default of MIXED into the config files support-files/my-medium.cnf.sh: Bug #39812: Add a default of MIXED into the config files support-files/my-small.cnf.sh: Bug #39812: Add a default of MIXED into the config files
* | Fixed warning message breakage.unknown2006-08-131-8/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed install breakage (my own fault) Edited exampled cnf to remove bdb references. mysql-test/r/backup.result: fix warnings mysql-test/r/im_options.result: Remove missed bdb skip mysql-test/r/im_utils.result: Remove missed bdb-skip mysql-test/r/log_tables.result: Fix warnings mysql-test/r/show_check.result: Fix warnings mysql-test/r/sp_trans.result: Fix warning mysql-test/r/type_timestamp.result: Fix warning mysql-test/r/warnings.result: Fix warning mysql-test/t/disabled.def: Disabled Federation test mysql-test/t/federated_transactions.test: Fixed comments in federation test netware/mysql_install_db.c: Fix install breakage. netware/mysql_test_run.c: Fix install breakage. scripts/mysql_install_db.sh: Fix install breakage storage/myisam/ftbench/ft-test-run.sh: Fixed test which is never run support-files/my-innodb-heavy-4G.cnf.sh: Modified examples support-files/my-small.cnf.sh: Modified examples
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-10-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp client/mysqlimport.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/t/mysqldump.test: Auto merged sql/field.cc: Auto merged sql/item_geofunc.cc: Auto merged sql/spatial.cc: Auto merged sql/spatial.h: Auto merged support-files/my-huge.cnf.sh: Auto merged support-files/my-innodb-heavy-4G.cnf.sh: Auto merged support-files/my-large.cnf.sh: Auto merged mysql-test/mysql-test-run.sh: Merged from 4.1. mysql-test/r/mysqldump.result: Merged from 4.1. mysql-test/t/gis.test: Merged from 4.1.
| * Fix typo (thread_cache should be thread_cache_size) in exampleunknown2005-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | configuration files. (Bug #13811) support-files/my-huge.cnf.sh: Fix name of thread_cache_size setting. support-files/my-innodb-heavy-4G.cnf.sh: Fix name of thread_cache_size setting. support-files/my-large.cnf.sh: Fix name of thread_cache_size setting.
* | Encourage user to specify a name for the binlog index file (either by giving ↵unknown2005-01-111-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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
* Merge with 4.0.21unknown2004-06-181-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Touchups to .cnf file comments.unknown2004-06-021-2/+2
| |
* | Be picky.unknown2004-03-201-4/+4
| |
* | Fix typos.unknown2003-12-011-2/+2
|/
* - heavily reworked the comments and layout of the new sample my.cnf fileunknown2003-07-161-265/+305
| | | | | | | | as requested by PeterZ support-files/my-innodb-heavy-4G.cnf.sh: - heavily reworked the comments and layout as requested by PeterZ
* New Sample config file.unknown2003-07-031-0/+469
The changes for actual loads and memory sizes are to be done after text and format are improved.
View Lorry Controller Status