summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My
Commit message (Collapse)AuthorAgeFilesLines
* merge with mysql-5.5.21Sergei Golubchik2012-03-091-1/+1
|\
* | updates after writing https://kb.askmonty.org/en/mysql-test-auxiliary-filesSergei Golubchik2012-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/README.suites: removed. it was turned into a manual, eventually mysql-test/include/default_mysqld.cnf: use normal environment variables instead of magic @OPT.vardir mysql-test/lib/My/ConfigFactory.pm: use normal environment variables instead of magic @OPT.vardir mysql-test/mysql-test-run.pl: initialize environment variables before parsing the first my.cnf template - it may refer to them mysql-test/suite/sphinx/my.cnf: use normal environment variables instead of magic @OPT.vardir
* | overlay support for mysql-test-run and mysqltestSergei Golubchik2012-02-235-38/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test-run auto-disables all optional plugins. mysql-test/include/default_client.cnf: no @OPT.plugindir anymore mysql-test/include/default_mysqld.cnf: don't disable plugins manually - mtr can do it better mysql-test/suite/innodb/t/innodb_bug47167.test: mtr now uses suite-dir as an include path mysql-test/suite/innodb/t/innodb_file_format.test: mtr now uses suite-dir as an include path mysql-test/t/partition_binlog.test: this test uses partitions storage/example/mysql-test/mtr/t/source.result: update results. as mysqltest includes the correct overlayed include storage/innobase/handler/ha_innodb.cc: the assert is wrong
* | small cleanupSergei Golubchik2012-02-071-0/+13
| |
* | allow suite.pm to skip combinations that originate from test/include files.Sergei Golubchik2012-02-071-0/+1
| | | | | | | | | | | | | | storage/innobase/handler/handler0alter.cc: for NEWDATE key_type says unsigned, thus col->prtype says unsigned, but field->flags says signed. Use the same flag for value retrieval that was used for value storage.
* | per-file combinationsSergei Golubchik2012-02-062-2/+8
| |
* | move --secure-file-priv from hardcoded to a template. remove redundant suite.optSergei Golubchik2012-02-061-9/+0
| |
* | 5.3 mergeSergei Golubchik2012-01-136-6/+7
|\ \
| * \ Merge with 5.1Michael Widenius2011-11-301-1/+1
| |\ \
| | * | test both federated and federatedX in the federated suite.Sergei Golubchik2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/lib/My/Options.pm: My::Options::is_set() now matches both option names and values! mysql-test/lib/mtr_cases.pm: 1. don't merge --plugin-load here, it's too early 2. don't skip combinations that set --plugin-load just because the test needs another --plugin-load. Skip *only* if test's --plugin-load matches *exactly* --plugin-load of one of the combinations. 3. if skipping all combinations but one, still assign the test to the combination mysql-test/mysql-test-run.pl: 1. remove dead code - don't set variables that aren't used. 2. bugfix: allow one-letter combination names 3. in the command line, merge all --plugin-load options in one storage/federated/ha_federated.cc: bugfix: garbage character in the generated SELECT query
| * | | Merge with MariaDB 5.1Michael Widenius2011-11-2415-20/+67
| |\ \ \ | | |/ /
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2115-20/+67
| | |\ \ | | | | | | | | | | | | | | | Fixed up copyright messages.
| | | * \ Updated/added copyright headersKent Boortz2011-07-033-11/+11
| | | |\ \
* | | | \ \ mysql-5.5.18 mergeSergei Golubchik2011-11-0314-15/+49
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Silly mistake in gdb output: replaced print with resfile_print,Bjorn Munch2011-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | but the latter only takes one argument, duh! Fixed by concatenating the args (replace , with .)
| * | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-3012-12/+46
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-3016-18/+63
| | | | | |
* | | | | | post-merge changes to the mysql-test suiteSergei Golubchik2011-10-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/include/check_ipv6.inc: don't try to connect to ipv6 address - the server isn't necessarily listening (e.g. a master doesn't, but a slave does. or vice versa) mysql-test/include/default_mysqld.cnf: move hard-coded values from ConfigFactory.pm to a template. really disable syncs mysql-test/include/have_archive_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/include/have_blackhole_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/include/have_federated_plugin.inc: wrong test. plugin is loaded in the test, it cannot be available before it mysql-test/lib/My/ConfigFactory.pm: move hard-coded values from ConfigFactory.pm to a template. really disable syncs mysql-test/mysql-test-run.pl: formatting mysql-test/suite/funcs_1/t/is_engines_federated.opt: federated can be a plugin mysql-test/suite/innodb/suite.pm: don't load xtradb plugin in embedded server - it lacks some symbols that xtradb needs mysql-test/suite/unit/suite.pm: don't run unit tests in --embedded-server (for simplicity and speed)
* | | | | | merge with 5.3Sergei Golubchik2011-10-193-8/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Made test-unit run in parlallel. This was achived by having all aria tests ↵Michael Widenius2011-05-131-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that uses temporary files to create the temporary file in an unique tempdirectory. aria_chk now returns 1 if one got any warnings during check and 2 if one got errors. lp:728919 maria_chk should fail on all detected corruptions mysql-test/lib/My/SafeProcess.pm: Removed ^M lines from the file storage/maria/ma_check.c: Fixed indentation storage/maria/maria_chk.c: aria_chk now returns 1 if one got any warnings during check and 2 if one got errors. storage/maria/unittest/ma_control_file-t.c: Use unique sub directory for test results storage/maria/unittest/ma_maria_log_cleanup.c: Added help function create_tmpdir() storage/maria/unittest/ma_pagecache_consist.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_rwconsist.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_rwconsist2.c: Use unique sub directory for test results storage/maria/unittest/ma_pagecache_single.c: Use unique sub directory for test results storage/maria/unittest/ma_test_all-t: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_multithread-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_noflush-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_nologs-t.c: Use unique sub directory for test results storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Use unique sub directory for test results remove delete of files that are already deleted by maria_log_remove() storage/maria/unittest/ma_test_loghandler_purge-t.c: Use unique sub directory for test results support-files/compiler_warnings.supp: Supress some warnings unittest/unit.pl: Run 4 unittests in parallel
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-0315-19/+65
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-0215-20/+65
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Moved some BSD string functions from Unireg
| * | \ \ \ \ Merge with base 5.2Michael Widenius2011-03-231-0/+3
| |\ \ \ \ \ \
| | * | | | | | Added --log-basename to mysqld to allow one to set the prefix for all logs ↵Michael Widenius2011-03-231-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with one command Changed test suite to use --log-basename (to get the code tested) Added --sync-sys=1 to test suite to speed it up. Better error messages if something goes wrong with mysql_install_db mysql-test/Makefile.am: Removed not existing directory mysql-test/lib/My/ConfigFactory.pm: Use log-basename We had to also set 'log_error' as some test was explicitely using the old name Added 'sync-sys=1' to speed up test suite mysql-test/r/variables-notembedded.result: Updated test results (variable relay_log is now set) mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_index-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt: Force specific names for some log files. mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test: Better error message if something goes wrong mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Updated results mysql-test/suite/rpl/rpl_1slave_base.cnf: Use --log-basename scripts/mysql_install_db.sh: More information to --help Write url to knowledge base if something goes wrong Fail at once if we can't create a database directory (no reason to continue and write a screenful of not related text) scripts/mysqld_safe.sh: Also allow one to use --data for --datadir (common shortening) Added support for --log-basename Fail at once if we can't create a log directory Fixed bug where we used a pid file name without '.pid' extension sql/log.cc: Create a log file name trough my_once_alloc() (To get it automaticly freed at exit) sql/mysql_priv.h: Added new prototype sql/mysqld.cc: Added support for --log-basename Better help for a lot of log-filename related variables. sql/rpl_rli.cc: Write information that one can use --log-basename sql/set_var.cc: Add log_basename as a readonly variable
| * | | | | | merge 5.2Vladislav Vaintroub2011-03-101-5/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Revoked changes from MySQL 5.1.55 merge as Sergei's code is more generalMichael Widenius2011-03-011-30/+17
| | | | | | |
| | * | | | | Fixed test failure that ended with "There is no group named 'mysqld.10' that ↵Michael Widenius2011-02-231-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be used to resolve 'port' for test" mysql-test/lib/My/ConfigFactory.pm: Added test name to error output mysql-test/mysql-test-run.pl: Added testname as part of ConfigFactory for better error message mysql-test/suite/rpl/t/rpl_test_framework.cnf: Added space after # to ensure that ConfigFactory treat comments as comments
| | * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-20/+32
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-9/+40
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | to be able to build MSI based installer
| * | | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed SCCS rule from Makefile.am - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label. Don't use maintainer mode with valgrind (as we don't want to initialize all variables) config/ac-macros/maintainer.m4: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) Force initialization of variables when using -Werror (To get rid of compiler warnings) configure.in: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) sql/sql_yacc.yy: Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
* | | | | | | move ctest handling from mtr to a separate suiteSergei Golubchik2011-07-162-1/+15
| | | | | | |
* | | | | | | only allocate extra-port (in tests) when neededSergei Golubchik2011-07-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (otherwise 10 ports per worker will be not enough)
* | | | | | | post-merge fixes.Sergei Golubchik2011-07-022-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most tests pass. 5.3 merge is next
* | | | | | | 5.5-mergeSergei Golubchik2011-07-0215-52/+111
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | WL #5680 MTR results written to file with well defined formatBjorn Munch2011-05-092-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --result-file option, which will produce var/mtr-results.txt Output has a simple format: <tag> : <value> for general info on test run { <tag> : <value> .... } for each test Output from failed tests are included but may be truncated. See WL for more details.
| * | | | | | upmerge 12379923 (60907)Bjorn Munch2011-04-261-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Bug #12379923 60907: MYSQL-TEST/LIB/MY/SAFEPROCESS/SAFE_PROCESS.PL USES ↵Bjorn Munch2011-04-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HARDCODED SIGNAL NUMBE Replaced the hardcoded 9 with 'KILL'
| | * | | | | Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND ↵Bjorn Munch2011-04-181-2/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMBINED WITH --DEBUG With this combination, outoput was directed to .trace but not all parts of MTR was aware of this. Replace .err with .trace at the earliest possible place
| * | | | | upmerge 12365486Bjorn Munch2011-04-181-2/+6
| |\ \ \ \ \
| | * | | | | Bug #12365486 MTR FAILS TO FIND WARNINGS IN SERVER LOG WITH --VALGRIND ↵Bjorn Munch2011-04-181-2/+6
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | COMBINED WITH --DEBUG With this combination, outoput was directed to .trace but not all parts of MTR was aware of this. Replace .err with .trace at the earliest possible place
| * | | | | upmerge 12351213,12360195Bjorn Munch2011-04-151-3/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug #12351213 MTR --VS-CONFIG DOES NOT WORK LIKE MTR_VS_CONFIGBjorn Munch2011-04-141-4/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for --vs-config applied Find.pm incorrectly tested an unitialized local variable instead of the global, corrected. Find.pm is also wrong in 5.5: uses a non-existent global variable. Fix when merging up.
| * | | | 11766640 follow-up: fix for VS_CONFIG on WindowsBjorn Munch2011-02-241-3/+2
| | | | |
| * | | | Bug #59489 Enable setting of env. variables for mysqld from mtrBjorn Munch2011-01-273-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added --mysqld-env option, propagate via safe_process Simplified: should be safe to set in parent safe_process after it's started Addendum: catch cases of --mysqld-env w/o value, assume env.var name never begins with "--"
| * | | | Fixed copyright headers in mtr src filesBjorn Munch2011-01-1813-15/+61
| |\ \ \ \ | | |/ / /
| | * | | Fixed copyright headers in mtr src filesBjorn Munch2011-01-1815-17/+63
| | | | |
| | * | | merge from 5.1Bjorn Munch2010-09-291-1/+1
| | |\ \ \
| * | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The autotools-based build system has been superseded and is being removed in order to ease the maintenance burden on developers tweaking and maintaining the build system. In order to support tools that need to extract the server version, a new file that (only) contains the server version, called VERSION, is introduced. The file contents are human and machine-readable. The format is: MYSQL_VERSION_MAJOR=5 MYSQL_VERSION_MINOR=5 MYSQL_VERSION_PATCH=8 MYSQL_VERSION_EXTRA=-rc The CMake based version extraction in cmake/mysql_version.cmake is changed to extract the version from this file. The configure to CMake wrapper is retained for backwards compatibility and to support the BUILD/ scripts. Also, a new a makefile target show-dist-name that prints the server version is introduced. VERSION: Add top-level version file. cmake/mysql_version.cmake: Get version information from the top-level VERSION file. Do not cache the version components (MAJOR_VERSION, etc). Add MYSQL_RPM_VERSION as a replacement for MYSQL_U_SCORE_VERSION.
* | | | | | merge.Sergei Golubchik2010-11-257-198/+157
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | checkpoint. does not compile.