summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-5/+2
|\
| * Merge with MySQL 5.1.55Michael Widenius2011-02-201-5/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * MergeKent Boortz2010-12-2913-2/+183
| | |\
| | | * - Added/updated copyright headersKent Boortz2010-12-2816-4/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed files specific to compiling on OS/2 - Removed files specific to SCO Unix packaging - Removed "libmysqld/copyright", text is included in documentation - Removed LaTeX headers for NDB Doxygen documentation - Removed obsolete NDB files - Removed "mkisofs" binaries - Removed the "cvs2cl.pl" script - Changed a few GPL texts to use "program" instead of "library"
| | * | Merge from mysql-5.0-bugteam.Alexander Nozdrin2010-11-242-5/+5
| | |\ \ | | | |/
| | | * A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- ↵Alexander Nozdrin2010-11-243-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | remove all EXCEPTIONS-CLIENT from all the places.
* | | | merge with 5.1Michael Widenius2011-01-071-1/+1
|\ \ \ \ | |/ / /
| * | | Don't do DBUG_ASSERT for checksum errors when using REPAIRMichael Widenius2011-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql_convert_table_format ignored --engine option. Fix that zerofill() doesn't write out wrong data to client if run with auto repair. Ensure that pagecache is properly flushed, even in case of errors. Handle checksum errors in BLOCK_RECORD format. scripts/mysql_convert_table_format.sh: Fixed that --engine option works storage/maria/ha_maria.cc: Fix that zerofill() doesn't write out wrong data to client if run with auto repair. storage/maria/ma_check.c: Set in_check_table when scanning table to not get DBUG_ASSERT for checksum error. Ensure that pagecache is properly flushed, even in case of errors. Handle checksum errors in BLOCK_RECORD format. storage/maria/ma_sort.c: Set in_check_table when scanning table to not get DBUG_ASSERT for checksum error.
* | | | Merge with 5.1Michael Widenius2010-12-041-2/+0
|\ \ \ \ | |/ / /
| * | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-011-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove all mentioning of /MAP /MAPINFO link options (does not work in VS2010). Remove map files from packaging. - Fix warning about ETIMEDOUT being redefined. - Fix warning about FSP_EXTENT_SIZE in xtradb (32/64 bit right shift mismatch) - Silence warnings coming from generated code (flex/bison) in xtradb/innodb_plugin. - Be nice to people without cygwin (me) and add win/configure-mariadb.bat with options suitable for quick compilation, e.g no embedded
* | | | merge with 5.1Sergei Golubchik2010-10-251-0/+1
|\ \ \ \ | |/ / /
| * | | 5.1.51 mergeSergei Golubchik2010-10-191-0/+1
| |\ \ \ | | |/ /
| | * | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Make the my_compiler.h header, like my_attribute.h, part of the distribution. This is required due to the dependency of the former on the latter (which can undefine __attribute__).
* | | | make_win_bin_dist: include all dynamic plugins, not only innodb_pluginSergei Golubchik2010-09-161-14/+6
| | | |
* | | | rename maria to ariaSergei Golubchik2010-09-122-4/+4
| | | |
* | | | merge with 5.1Sergei Golubchik2010-09-115-29/+32
|\ \ \ \ | |/ / /
| * | | Updated failure text for maria_install_dbMichael Widenius2010-09-091-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't give warning about block_insert if table is crashed. scripts/mysql_install_db.sh: Added link to KB. storage/maria/ma_recovery.c: Don't give warning about block_insert if table is crashed.
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-274-21/+28
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed to still use bcmp() in certain cases becasue - Faster for short unaligneed strings than memcmp() - Bettern when using valgrind - Changed to use my_sprintf() instead of sprintf() to get higher portability for old systems - Changed code to use MariaDB version of select->skip_record() - Removed -%::SCCS/s.% from Makefile.am:s to remove automake warnings
| | * | Bug #54004 : mysql_secure_installation identifies "local host" incorrectlyGeorgi Kodinov2010-07-142-2/+2
| | | | | | | | | | | | | | | | | | | | The removal of non-local root users is overzealous in mysql_secure_installation. (Bug #54004)
| | * | Bug #52274 : Missing path to mysql in mysql_secure_installationGeorgi Kodinov2010-07-091-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Added some code to try to find the mysql command line in the most common places and stop if it's not there.
| | * | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given tableGeorgi Kodinov2010-07-011-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed an incomplete historical ALTER TABLE MODIFY trimming the trigger privilege bit from mysql.tables_priv.Table_priv column. Removed the duplicate ALTER TABLE MODIFY. Test suite added.
* | | | Automerge with 5.1Michael Widenius2010-08-252-2/+30
|\ \ \ \ | |/ / /
| * | | Trivial fixes, more safe DBUG_ASSERT()'s and some more DBUG_Michael Widenius2010-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CTRL-C now aborts 'source' commands in mysql client - Fix that thread id's are removed in convert-debug-for-diff.sh client/mysql.cc: CTRL-C now aborts 'source' commands scripts/convert-debug-for-diff.sh: Fix expression to remove thread id storage/maria/ha_maria.cc: Don't call DBUG_ASSERT() when we kill a query during REPAIR / ALTER TABLE storage/maria/ma_bitmap.c: Added DBUG_ASSERT() if we call _ma_bitmap_set_full_page_bits() storage/maria/ma_key_recover.c: Don't do an assert if table is marked crashed. storage/maria/ma_recovery.c: Added DBUG_ENTER
| * | | Added verbose mode to recoveryMichael Widenius2010-08-182-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More DBUG Added convert-debug-for-diff Added missing (from last push) federated test case .bzrignore: Ignore generated files mysql-test/README: Updated documentation for --extern mysql-test/suite/federated/federated_bug_32426.result: Added test for federatedx mysql-test/suite/federated/federated_bug_32426.test: Added test for federatedx scripts/Makefile.am: Added convert-debug-for-diff scripts/convert-debug-for-diff.sh: Added script for converting sql/log.cc: Added DBUG sql/mysqld.cc: Added DBUG storage/maria/ma_recovery.c: If verbose, write dirty pages (for debugging) storage/maria/ma_static.c: Added verbose mode to recovery storage/maria/maria_def.h: Added verbose mode to recovery storage/maria/maria_read_log.c: Added verbose mode to recovery
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-052-4/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
| * | | Fixed compiler warningsMichael Widenius2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some wrong test cases Fixed bug in null handling in XtraDB extra/comp_err.c: Fixed compiler warnings extra/my_print_defaults.c: Fixed compiler warnings mysql-test/suite/binlog/t/binlog_killed.test: Added support for timeouts mysql-test/suite/funcs_1/r/is_columns_is.result: Updated results (INNODB_SYS_TABLES had got new column) scripts/mysql_install_db.sh: Fixed typo sql/mysql_priv.h: Removed not needed argument for compare_record() sql/sql_insert.cc: Removed not needed argument for compare_record() sql/sql_update.cc: Removed not needed argument for compare_record() The argument is not needed becasue we copy the full record[0] to record[1] and the comparison should work even if all columns are not read sql/table.cc: The comparison of rows is independent of HA_PARTIAL_COLUMN_READ storage/maria/maria_chk.c: Fixed compiler warnings storage/maria/maria_read_log.c: Fixed compiler warnings storage/myisam/myisamchk.c: Fixed compiler warnings storage/myisam/myisampack.c: Fixed compiler warnings storage/xtradb/dict/dict0load.c: Fixed compiler warnings storage/xtradb/row/row0sel.c: Fixed null handling in XtraDB. (See comment) storage/xtradb/trx/trx0sys.c: Fixed compiler warnings support-files/compiler_warnings.supp: Fixed compiler warnings
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+5
| |\ \ \ | | |/ / | | | | | | | | Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
| | * | Bug#54590 "make_binary_distribution" fails because a commandJoerg Bruehe2010-06-171-3/+5
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | line exceeds the limit Upmerge the fix from 5.0 to 5.1
| | | * Bug#54590 "make_binary_distribution" fails because a commandJoerg Bruehe2010-06-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | line exceeds the limit The number and/or names of our files for the main test suite (contents of "mysql-test/t/") now exceeds the command line length limit on AIX. Solve the problem by using separate "cp" commands for the various file name extensions.
* | | | fixes for buildbotSergei Golubchik2010-07-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/suite/funcs_1/r/is_columns_is.result: update for monty changes mysql-test/valgrind.supp: more generic suppression for dlerror() internal allocations scripts/make_win_bin_dist: update for hakan changes - we don't generate .map files anymore sql/CMakeLists.txt: innodb_plugin is said to need .map files in sql/
* | | | Automerge MariaDB 5.1->5.2.unknown2010-07-091-0/+9
|\ \ \ \ | |/ / /
| * | | Fix a loop and install more script files. Renames the perlscripts component ↵Bo Thorsen2010-06-281-1/+5
| | | | | | | | | | | | | | | | to scripts, since it now also has sql scripts.
| * | | Implement an NSIS based installerBo Thorsen2010-06-251-0/+5
| | | |
* | | | merge 5.1->5.2Sergei Golubchik2010-06-016-69/+106
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.47Michael Widenius2010-05-262-1/+14
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some bugs introduced in 5.1.47 Disabled some tests until we have merged with latest Xtradb configure.in: Added testing if valgrind/memcheck.h exists storage/pbxt/src/ha_pbxt.cc: LOCK_plugin is not anymore locked in init
| | * | Bug #43594: mysqlhotcopy does not ignore log tables and others in mysql databaseGeorgi Kodinov2010-04-121-0/+8
| | | | | | | | | | | | | | | | | | | | Added a filter to mysqlhotcopy to filter out the same tables in the 'mysql' database that mysqldump filters out.
| | * | Bug #47095: Can't open_files_limit really be larger than 65535?Georgi Kodinov2010-04-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several problems addressed: 1. The maximum value for --open_files_limit on non-windows boxes is now raised to UINT_MAX (the maximum possible without significant changes in the code). The maximum value on windows is kept to be 2048 due to a known limitation (bug 24509). 2. mysqld_safe now supports --open_files_limit=xx in addition to --open-files-limit=xx 3. mysqld_safe always passes through --open[_-]files[_-]limit to the underlying mysqld. It used to pass it through only if it the user running the script has access to the root directory or there was an --user argument specified. 4. Fixed a prototype in my_file.c to match its counterpart in the other #ifdef branch.
| * | | Automerge latest MariaDB 5.1 trunk into 5.1.46 release.unknown2010-05-151-7/+7
| |\ \ \
| * | | | Fixes after last merge of MySQL 5.1Michael Widenius2010-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - INSERT with RAND() doesn't require row based logging again - Some bugs fixed in opt_range() where we table->key_read was wrongly used .bzrignore: Ignore new xtstat binary mysql-test/r/index_merge_myisam.result: Update results (old result was wrong) mysql-test/suite/binlog/r/binlog_stm_binlog.result: Added drop table first mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result: Added test for when RAND() requires row based logging mysql-test/suite/binlog/t/binlog_stm_binlog.test: Added drop table first mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: Added test for when RAND() requires row based logging scripts/make_binary_distribution.sh: Removed type from last commit sql/item_create.cc: Don't require row based logging when using RAND() with INSERT sql/opt_range.cc: Revert wrong patch from Oracle: - As QUICK_RANGE_SELECT uses it's own 'file' handler to the tables, one can't use 'table->key_read' as a flag to detect if index only read (keyread) is used or not - Don't set keyread if keyread is already enabled - Don't disable key read, if we didn't enable it ourselves - Simplify code (and ensure that we do proper cleanup of index only read) sql/opt_range.h: Added flags to detect if the range optimizer enabled index only read (key read) or not sql/opt_sum.cc: Use our more optimized macros sql/sql_lex.h: Added 'readable' function to check if we are in a sub query function or not (not normal query or sub query in FROM clause) sql/sql_select.cc: Use our more optimized keyread macros Added ASSERTS early Simplify code on eliminate_item_equal() Fixed that substitute_for_best_equal_field() doesn't core dump in case of out of memory conditions. Removed not needed test for 'field->maybe_null()' Replaced master_unit()->item with is_subquery_function() (More readable) sql/sql_update.cc: Use our more optimized keyread macros sql/table.cc: Use our more optimized keyread macros sql/table.h: Use separate functions to enable/disable Index only reads - Safer, more readable, better logging and faster.
| * | | | Merge to get PBXT's xstat programMichael Widenius2010-05-122-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Added copying of xstat scripts/make_win_bin_dist: Added copying of xstat
| * \ \ \ \ Merged MySQL 5.1.46 GPLed documentation into MariaDB.unknown2010-04-281-66/+66
| |\ \ \ \ \
| | * | | | | Imported MySQL documentation files from ../mysql-5.1.46unknown2010-04-281-66/+66
| | | | | | |
| * | | | | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-282-3/+19
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | | Still two test failures to be solved: main.myisam and main.subselect.
| | * | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL uses two source layouts when building : the bzr layout and the source package layout. The previous fix for bug 35250 contained 1 change that is valid for both modes and a number of changes that are valid only for the bzr source layout. The important thing was to fix the source package layout. And for this the change in configure.in was sufficient. It's not trivial (and not requested by this bug) to support VPATH builds from the bzr trees. This is why the other changes are reverted and the change to fix the VPATH build for source distributions is left intact.
| | * | | | mergeGeorgi Kodinov2010-03-011-2/+19
| | |\ \ \ \
| | | * | | | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that the CSV storage engine does not support NULL fields, yet in some early 5.1 version the log tables (general_log and slow_log) were created with null fields. On top of this, when altering a CSV table column, all fields of the table must be NOT NULL otherwise the alteration fails. The solution is to ensure that during upgrade all columns of the log tables are NOT NULL. mysql-test/r/log_tables_upgrade.result: Add test case result for Bug#49823. mysql-test/std_data/bug49823.CSV: Sample data for test. mysql-test/std_data/bug49823.frm: Add a CSV table which mimics the general_log table, except that it contains a nullable column. mysql-test/t/log_tables_upgrade.test: Add test case for Bug#49823. scripts/mysql_system_tables_fix.sql: Ensure that all columns of the log tables are NOT NULL.
| | * | | | | Bug #51468: mysqld_multi is broken in 5.1.44Georgi Kodinov2010-02-261-1/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixed a syntax error in mysqld_multi.sh
| | * | | | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed several (obvious) places that don't work with vpath build.
* | | | | | mergedSergei Golubchik2010-05-152-8/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Build perl scripts in the correct directoryBo Thorsen2010-05-121-7/+7
| | | | | |