summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-1255-1567/+1067
|\
| * Fix use of uninitialized variable.Alexander Nozdrin2010-08-121-1/+1
| |
| * fix for Bug #55672 "mysql_upgrade dies with internal error":Guilhem Bichot2010-08-115-28/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it couldn't parse the --ssl option. client/mysql_upgrade.c: mysql_upgrade parses its options and passes some of them to the underlying tools (mysqlcheck etc). To do this passdown, it reconstructs a command-line-suitable text from the my_option object (which contains the option's name and option's value). For options which expect no parameter, it just had to use the option's name; for other options, it had to concatenate the option's name, a "=" symbol, and the option's value; it had code to handle this latter case, but only for GET_STR options (options taking a string as value). But since the work on WL 4738, the --ssl option, a GET_BOOL, which used to have no parameter (NO_ARG), can now have one (OPT_ARG), so with --ssl we came to the "default" label, error. Fixed by constructing the command-line-suitable representation for GET_BOOL too. For --ssl it will produce --ssl=1 ; for --ssl=0, it will produce --ssl=0. mysql-test/include/mysql_upgrade_preparation.inc: handles requirements of tests which use mysql_upgrade mysql-test/r/mysql_upgrade_ssl.result: result; without the code fix we would get "internal error". mysql-test/t/mysql_upgrade.test: This test has requirements before running; moved them to an include file in order to share with mysql_upgrade_ssl. mysql-test/t/mysql_upgrade_ssl.test: test for bug. Couldn't go into mysql_upgrade.test as this new test requires SSL support. --force is needed, in case mysql_upgrade.test run before (in which case mysql_upgrade_ssl would say that upgrade has already been done); --force forces the upgrade in all cases.
| * Bug#55462 Performance schema: reduce the overhead of ↵Marc Alff2010-08-124-39/+7
| | | | | | | | | | | | | | | | | | | | PFS_events_waits::m_wait_class This is a performance improvement fix. Removed the "volatile" property of PFS_events_waits::m_wait_class. Simplified the code accordingly.
| * Merge to mysql-5.5-bugfixingJonathan Perkin2010-08-102-36/+32
| |\
| | * Don't try to remove from an empty list.Jonathan Perkin2010-08-091-17/+19
| | |
| | * Apply wlad's fix for bug#55215Jonathan Perkin2010-08-093-37/+31
| | |
| * | BUG#50312 Warnings for unsafe sub-statement not returned to clientAlfranio Correia2010-08-1017-1259/+782
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After BUG#36649, warnings for sub-statements are cleared when a new sub-statement is started. This is problematic since it suppresses warnings for unsafe statements in some cases. It is important that we always give a warning to the client, because the user needs to know when there is a risk that the slave goes out of sync. We fixed the problem by generating warning messages for unsafe statements while returning from a stored procedure, function, trigger or while executing a top level statement. We also started checking unsafeness when both performance and log tables are used. This is necessary after the performance schema which does a distinction between performance and log tables. mysql-test/extra/rpl_tests/create_recursive_construct.inc: Changed the order of the calls in the procedure because the code that checks if a warning message is printed out expects that the first statement gives an warning what is not the case for INSERT INTO ta$CRC_ARG_level VALUES (47); mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result: Updated the result file. mysql-test/suite/binlog/r/binlog_unsafe.result: There are several changes here: (1) - Changed the CREATE PROCEDURE $CRC. (2) - The procedure $CRC was failing and the content of the binlog was being printed out, after fix (1) the failure disappeared. (3) - The warning message for unsafeness due to auto-increment collumns was changed. (4) - The warning message for unsafeness due to VERSION(), RAND() was changed. mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: Tested filters. mysql-test/suite/binlog/t/binlog_unsafe.test: Reenabled the test case binlog_unsafe. mysql-test/suite/binlog/t/disabled.def: Reenabled the test case binlog_unsafe. mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result: Updated the result file. mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result: Updated the result file. mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result: Updated the result file. sql/sql_class.cc: Moved the stmt_accessed_table_flag variable and related information to the LEX as we need the variable reset after each statement even inside a stored procedure, what did not happen if the information was in the THD. Changed the routine in the THD::binlog_query that prints the warning messages to avoid trying to print them when inside a stored procedure, function or trigger. Checked for unsafeness when both performance and log tables where used. After the introduction of the performance schema, we need to check both.
| * | Bug #55842 CMake: bad dependencies on sql/lex_hash.h Vladislav Vaintroub2010-08-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix by adding "DEPENDS gen_lex_hash" to ADD_CUSTOM_COMMAND(), so it regenerates lex_hash.h whenever gen_lex_lash changes. Also, make sql dependent on GenServerSource to avoid concurrent generation of lex_hash.h (once for sql , and in parallel for embedded)
| * | Disable rpl_ndb.rpl_ndb_row_implicit_commit_binlog due to Bug 55849.Alexander Nozdrin2010-08-091-0/+1
| | |
| * | Follow-up for Bug 23032: update NDB result files.Alexander Nozdrin2010-08-092-0/+4
| | |
| * | Remove error injection option, it's not being used.Davi Arnaut2010-08-092-22/+0
| | |
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-08-091-1/+1
| | | | | | | | | | | | | | | Post-merge fix: add missing comma.
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-08-0617-82/+14
| | | | | | | | | | | | | | | | | | | | | Post-merge fix: remove --with-debug=full, it was only used for safemalloc. BUILD/compile-pentium-mysqlfs-debug: Remove build script for a feature that is long gone.
| * | Bug#55601: BUILD/check-cpu in mysql-trunk is broken on Mac OS X 10.5Davi Arnaut2010-08-051-71/+75
| | | | | | | | | | | | | | | | | | Restore the original behavior of check-cpu with respect to core2. It isn't used as a actual target processor type, but as a mean to perform other kinds of architecture checks.
| * | Build cleanupsVladislav Vaintroub2010-08-055-27/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Simplify sql-bench installation, do not try to resolve names : this leads to probem if builddir is symlink located on different filesystem. (reported by alik) - Make WITHOUT_XXX (disabling plugin) work for DEFAULT plugins. Prior to the patch is behaved just like MANDATORY. - LINK_LIBRARIES in MYSQL_ADD_PLUGIN had no effect for statically linked plugins. - Fix constant rebuild of initdb target on Windows.
| * | Auto-merged.Evgeny Potemkin2010-08-053-9/+13
| |\ \
| | * | Fix default.conf.Alexander Nozdrin2010-08-041-1/+1
| | |/
| * | Bug#55648: Server crash on MIX/MAX on maximum time valueEvgeny Potemkin2010-08-023-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A typo in the Item_cache_datetime::val_str caused an assertion to fail on the maximum time value. mysql-test/r/func_group.result: A test case for the bug#55648. mysql-test/t/func_group.test: A test case for the bug#55648. sql/item.cc: Bug#55648: Server crash on MIX/MAX on maximum time value Corrected assertion.
* | | merge from trunk-mtrBjorn Munch2010-08-0552-393/+350
|\ \ \ | |_|/ |/| |
| * | upmerge 55582Bjorn Munch2010-08-054-3/+51
| |\ \
| | * \ merge from 5.1Bjorn Munch2010-08-04286-2406/+12157
| | |\ \
| | * | | Bug #55582 mtr root detection (and if-expression execution) brokenBjorn Munch2010-08-042-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Follow-up patch: added test cases for -0 and while
| | * | | Bug #55582 mtr root detection (and if-expression execution) brokenBjorn Munch2010-08-034-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if() treated any non-numeric string as false Fixed to treat those as true instead Added some test cases Fixed missing $ in variable name in include/mix2.inc
| * | | | upmerge 55503,55597Bjorn Munch2010-08-021-5/+25
| |\ \ \ \ | | |/ / /
| | * | | Bug #55597 MTR: Restart the server, from within the test case, with new CLI ↵Bjorn Munch2010-08-021-3/+23
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options. The expect file can now include "restart:<server options>" Also drop check-testcase if this has been done Added comment explaining the restart: syntax
| | | * | | Bug #55597 MTR: Restart the server, from within the test case, with new CLI ↵Bjorn Munch2010-07-281-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | options. The expect file can now include "restart:<server options>" Also drop check-testcase if this has been done
| | * | | | Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of ↵Bjorn Munch2010-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restarted servers Was not covered by "skip" pattern Replace with a more generic pattern for SUMMARY
| * | | | | Bug #54660 MTR cannot start server properly with non-default ↵Bjorn Munch2010-07-282-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innodb_log_file_size Pass any --innodb* options to bootstrap as well Backported to v1, where also a removal of --loose-skip-innodb is needed
| * | | | | merge from trunkBjorn Munch2010-07-23724-13821/+16477
| |\ \ \ \ \
| * | | | | | Bug #54835 MTR version 1 cannot start server - bootstrap reports unknown ↵Bjorn Munch2010-07-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InnoDB engine Remove --loose-skip-innodb from startup options This is a simple backport of change done in WL #5349 Same as shown as "temporary fix", cherry picked to -mtr branch
| * | | | | | merge from trunkBjorn Munch2010-07-14292-2860/+7519
| |\ \ \ \ \ \
| * \ \ \ \ \ \ null upmergeBjorn Munch2010-06-170-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | merge from 5.1 up to rev 3408Bjorn Munch2010-06-17325-12742/+8824
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ merge from trunkBjorn Munch2010-06-17865-36022/+34797
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ upmerge fix for 54364Bjorn Munch2010-06-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug #54364 Allow multiple --experimental command line options for MTRBjorn Munch2010-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bummer: MTR fails if a test fails and no --experimental is used $experimental_test_cases must be intialized
| * | | | | | | | | upmerge 52321,53374,53949,54111,54364,54368Bjorn Munch2010-06-155-41/+119
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge 54368Bjorn Munch2010-06-151-0/+2
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug #54368 MTR does not recognize carriage return in --defaults-fileBjorn Munch2010-06-141-0/+2
| | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove any leftover trailing ^M from lines read in
| | * | | | | | | | merge 54364Bjorn Munch2010-06-152-32/+36
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug #54364 Allow multiple --experimental command line options for MTRBjorn Munch2010-06-102-32/+36
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert --experimental into a multi option Size of diff is caused by intenting code put into a for loop
| | * | | | | | | | Bug #54111 mysqltest command remove_files_wildcard does not work in embedded ↵Bjorn Munch2010-06-151-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server Wildcard chars are changed in embedded mode Temporarily reset the wild_* variables before wild_compare, also for list_files
| | * | | | | | | | merge 53949Bjorn Munch2010-06-151-4/+25
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug #53949 Allow MTR2 to start server without hardcoded command-line optionsBjorn Munch2010-06-091-4/+25
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added option --user-args, to be used with --start* Only keeps --defaults-file and --defaults-group-suffix Also added missing help text entry for --start-and-exit
| | * | | | | | | | Bug #52321 mtr test suite paths need to be updatedBjorn Munch2010-06-153-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use $suitedir instead of $basedir to find suites Add 'testdir' to ConfigFactory
| | * | | | | | | | Bug #53374 Don't delete temporary perl file if perl failsBjorn Munch2010-06-071-2/+3
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple condition on the delete stmt But NB: next mtr run will clean up and remove the temp file
| * | | | | | | | null upmergeBjorn Munch2010-06-020-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge from 5.1 up to rev 3392Bjorn Munch2010-06-021523-10066/+954338
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge from mysql-trunkBjorn Munch2010-06-02648-18971/+52430
| |\ \ \ \ \ \ \ \ \