summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* Upgraded to latest handlersocket code. This fixed LP:766870 "Assertion ↵Michael Widenius2011-06-071-1/+0
| | | | | | | `next_insert_id == 0' failed with handlersocket" sql/handler.cc: Added DBUG_ code
* Merge with MariaDB 5.2Michael Widenius2011-05-101-5/+5
|\
| * Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+5
| |\
| | * Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+5
| | |\ | | | | | | | | | | | | Moved some BSD string functions from Unireg
| | | * Fixed copyright headers in mtr src filesBjorn Munch2011-01-181-5/+4
| | | |
* | | | mergeVladislav Vaintroub2011-03-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge with base 5.2Michael Widenius2011-03-231-1/+1
| |\ \ \
| | * | | Added --log-basename to mysqld to allow one to set the prefix for all logs ↵Michael Widenius2011-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 mwl#55Vladislav Vaintroub2011-03-111-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | merge 5.2Vladislav Vaintroub2011-03-101-2/+2
| |\ \ \ \ | | |/ / /
| * | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-291-2/+4
| | | | | | | | | | | | | | | | | | | | to be able to build MSI based installer
* | | | | Merge with 5.2Michael Widenius2011-03-091-2/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-2/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge with MySQL 5.1.55Michael Widenius2011-02-201-2/+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-291-2/+2
| | | |\
| | | | * - Added/updated copyright headersKent Boortz2010-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 with 5.1Michael Widenius2011-01-111-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Fixes to get Aria handler tests to work. Fixes LP#697597 "HANDLER + Aria asserts in maria-5.3-handler"
| * | | | Automatic merge with 5.1Michael Widenius2011-01-101-0/+1
| |\ \ \ \ | | |/ / /
| | * | | - Fixed that Aria works with HANDLER commandsMichael Widenius2011-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added test case for Aria - Tested HANDLER with HEAP (changes to HEAP code will be pushed in 5.3) - Moved all HANDLER test to suite/handler. mysql-test/Makefile.am: Added suite/handler mysql-test/mysql-test-run.pl: Added suite/handler mysql-test/r/lock_multi.result: Remove test that is already in handler test suite mysql-test/suite/handler/aria.result: Test for HANDLER with Aria storage engine mysql-test/suite/handler/aria.test: Test for HANDLER with Aria storage engine mysql-test/suite/handler/handler.inc: Extended the general handler test Moved interface testing to 'interface.test' mysql-test/suite/handler/init.inc: Common init for handler tests. mysql-test/suite/handler/innodb.result: New results mysql-test/suite/handler/innodb.test: Update to use new include files mysql-test/suite/handler/interface.result: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/interface.test: Test of HANDLER interface (not storage engine dependent parts) mysql-test/suite/handler/myisam.result: New results mysql-test/suite/handler/myisam.test: Update to use new include files mysql-test/t/lock_multi.test: Remove test that is already in handler test suite mysys/tree.c: Added missing handling of read previous (showed up in HEAP testing) sql/handler.cc: Don't marka 'HA_ERR_RECORD_CHANGED' as fatal (can be used with HANDLER READ, especially with MEMORY ENGINE) sql/handler.h: Added prototype for can_continue_handler_scan() sql/sql_handler.cc: Re-initialize search if we switch from key to table search. Check if handler can continue searching between calls (via can_continue_handler_scan()) Don't write common not fatal errors to log storage/maria/ma_extra.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_ft_boolean_search.c: Ensure that info->last_key.keyinfo is set storage/maria/ma_open.c: Don't set index 0 as default. This forces call to ma_check_index() to set up index variables. storage/maria/ma_rkey.c: Trivial optimization storage/maria/ma_rnext.c: Added missing code from mi_rnext.c to ensure that handler next/prev works. storage/maria/ma_rsame.c: Simple optimizations storage/maria/ma_search.c: Initialize info->last_key once and for all when we change keys. storage/maria/ma_unique.c: Ensure that info->last_key.keyinfo is up to date.
* | | | | Add optimizer_unfixed_bugs tests/results to the list of installed filesSergey Petrunya2010-11-091-1/+3
|/ / / /
* | | | add sphinx suiteSergei Golubchik2010-09-121-1/+1
| | | |
* | | | merge with 5.1Sergei Golubchik2010-09-111-8/+6
|\ \ \ \ | |/ / /
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * | Add the innodb_plugin tests to "make dist".Vasil Dimov2010-07-071-0/+2
| | | |
* | | | Automerge with 5.1Michael Widenius2010-08-251-2/+3
|\ \ \ \ | |/ / /
| * | | generalization of mtr to support suite.pm extensions:Sergei Golubchik2010-08-171-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * no automatic --loose-skip-innodb added by mtr based on the test name. instead loose-skip-innodb is now in the default_mysqld.cnf * have_innodb_plugin.inc is changed to give a verbose "skip" message (instead of "require: true") * My::Suite class. It's support in mtr, and everywhere * support for suite.pm * when sorting tests, take combinations into account * support for SUITENAME_COMBINATIONS * no special treatment for innodb_plugin in mtr_cases.pm * two special pre-created config groups: ENV and OPT * allow option names to start from # * allow magic option to have an argument * remove dead code * fix @-substitution to works as expected * new processes take the value of $opt_verbose automatically, no need to pass it to a constructor * innodb_plugin suite uses suite.pm and combinations file to test as much as possible (innodb plugin, xtradb plugin, xtradb static - whatever available) * besides test-master.opt and test-slave.opt a test.opt file is also loaded, both for master and slave * .opt files for all included files are loaded too * progress report in the xterm titlebar
* | | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | Removed references to HA_END_SPACE_KEY (which has been 0 for a long time)
| * | | Fix mysql-test/suite/percona missing from `make dist`.unknown2010-08-041-0/+1
| | | |
| * | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-0/+1
| |\ \ \ | | | | | | | | | | | | | | | Fixed Bug#52005 'JOIN_TAB->dependent' may be incorrectly propageted for multilevel outer joins' in a better way (patch from Sergey Petrunya)
| | * | | rko Mdkeld change, revision 3351.14.134 add innodb_plugin to mysql-test-run ↵sunanda2010-07-071-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | default suites was not complete. Bootstrap failed to pick up necessary files needed by test and hence all tests failed.
* | | | merge 5.1->5.2Sergei Golubchik2010-06-011-1/+5
|\ \ \ \ | |/ / /
| * | | Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+5
| |\ \ \ | | |/ / | | | | | | | | Still two test failures to be solved: main.myisam and main.subselect.
| | * | Test suites for engine testing, moved from test-extra so will be availableOmer BarNir2010-03-171-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for general use. mysql-test/Makefile.am: Adding directories of additional test suites mysql-test/mysql-stress-test.pl: Adding check for additional errors checking during test run
| | * | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-03-091-2/+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.
| | * | Bug #35250: readline check breaks when doing vpath buildGeorgi Kodinov2010-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | Fixed several (obvious) places that don't work with vpath build.
* | | | Fix type in merge, breaking `make dist` for oqgraph.unknown2010-03-311-1/+1
| | | |
* | | | Merge OQGraph into MariaDB 5.2.unknown2010-03-311-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | (and in the process, fix compile-bintar to link C++ with g++ rather than gcc).
| * | | | OQGraph testsuite was forgotten from `make dist`.unknown2010-03-301-1/+2
| |/ / /
* | | | Fix merge errors in configure.inunknown2010-03-181-1/+2
|/ / / | | | | | | | | | Add vcol test suite to `make dist`.
* | | MySQL 5.1.38 merge into MariaDB.unknown2009-09-151-1/+2
|\ \ \ | |/ / | | | | | | | | | Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing from the original merge).
| * | Apply patch from bug#46834 to install the test suite in RPMs.Jonathan Perkin2009-08-211-1/+2
| | |
* | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | * Finished Monty and Jani's merge * Some InnoDB tests still fail (because it's old xtradb code run against newer testsuite). They are expected to go after mergning with the latest xtradb.
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-4/+3
| |\ \
| | * | The valgrind suppression file (valgrind.supp) must be added toDavi Arnaut2009-06-051-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a binary distribution of the server as the MTR valgrind option relies on it to silence unmeaningful warnings. mysql-test/Makefile.am: Install valgrind.supp as part of the test suite. Remove reference to inexistent directory.
| * | | Add innodb plugin tests to a new mysql test suite 'innodb'.Satya B2009-06-101-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Created a test suite 'innodb' under mysql-test/suite/innodb for the innodb plugin tests. test suite 'innodb' has tests only which are not under any other mysql-test suites. Total 14 testcases are added to the test suite. Note: the patches in storage/innodb_plugin/mysql-test/patches are not applied yet
* | | Fixed problems in mergeMichael Widenius2009-05-191-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema.result: Fixed a result file. mysql-test/r/innodb-autoinc.result: Fixed a result file. mysql-test/t/connect.test: Fixed a problem with merge, needed to close connections and use the default
| * | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consequently, rename HAVE_purify to HAVE_valgrind, and related changes. Leave some comments about purify when not clear that they apply also to Valgrind. Fix redundant IF_VALGRIND declaration. Misc. small fixes: - Fixes for pool-of-threads patch. - Fixes for push of PBXT storage engine. - mysql-test-run.pl fix. - Fix build problem in compile-pentium64-max. BUILD/SETUP.sh: Rename purify -> valgrind. BUILD/build_mccge.sh: Rename purify -> valgrind. BUILD/compile-dist: Fix that PBXT was missing in source tarball after `BUILD/compile-dist && make dist` BUILD/compile-pentium64-max: Fix a build problem with BUILD/compile-pentium64-max on CentOS/Fedora Core 10 amd64. On these systems, there is libz.so but no libz.a. Finding libz.so, ./configure decides to use system zlib. But since BUILD/compile-pentium64-max builds a fully static binary with -all-static, the link of mysqld fails due to missing libz.a. Fix by using bundled zlib in the build script. BUILD/compile-solaris-sparc-purify: Rename purify -> valgrind. include/m_string.h: Rename purify -> valgrind. include/my_global.h: Rename purify -> valgrind. mysql-test/Makefile.am: Fix that PBXT test suite was missing from `make dist` source tarball. mysql-test/lib/mtr_unique.pm: Better fix to avoid races when chmod'ing the semaphore file. (Though using chmod 666 shared files in /tmp/ is still not a very good solution). mysql-test/t/pool_of_threads.cnf: Fix that test case pool_of_threads fails if run on mysqld with no --with-libevent support. mysys/mf_qsort.c: Rename purify -> valgrind. mysys/my_alloc.c: Rename purify -> valgrind. mysys/my_init.c: Rename purify -> valgrind. mysys/my_rnd.c: Rename purify -> valgrind. mysys/safemalloc.c: Rename purify -> valgrind. scripts/mysql_config.pl.in: Rename purify -> valgrind. scripts/mysql_config.sh: Rename purify -> valgrind. sql/field_conv.cc: Rename purify -> valgrind. sql/filesort.cc: Rename purify -> valgrind. sql/ha_partition.cc: Rename purify -> valgrind. sql/hostname.cc: Rename purify -> valgrind. sql/item_timefunc.cc: Rename purify -> valgrind. sql/log_event.cc: Rename purify -> valgrind. sql/log_event_old.cc: Rename purify -> valgrind. sql/my_decimal.h: Rename purify -> valgrind. sql/mysqld.cc: Rename purify -> valgrind. Fix redundant IF_VALGRIND declaration. sql/opt_range.cc: Rename purify -> valgrind. sql/opt_range.h: Rename purify -> valgrind. sql/records.cc: Rename purify -> valgrind. sql/rpl_rli.cc: Rename purify -> valgrind. sql/rpl_rli.h: Rename purify -> valgrind. sql/set_var.cc: Fix missing static declaration on pool_of_threads. sql/slave.cc: Rename purify -> valgrind. sql/sql_base.cc: Rename purify -> valgrind. sql/sql_binlog.cc: Rename purify -> valgrind. sql/sql_class.cc: Rename purify -> valgrind. sql/sql_list.h: Rename purify -> valgrind. sql/sql_load.cc: Rename purify -> valgrind. sql/sql_select.cc: Rename purify -> valgrind. sql/table.cc: Rename purify -> valgrind. storage/archive/azio.c: Rename purify -> valgrind. storage/innobase/buf/buf0buf.c: Rename purify -> valgrind. storage/innobase/include/univ.i: Rename purify -> valgrind. storage/innobase/srv/srv0start.c: Rename purify -> valgrind. storage/maria/ha_maria.cc: Rename purify -> valgrind. storage/maria/ma_blockrec.c: Rename purify -> valgrind. storage/maria/ma_check.c: Rename purify -> valgrind. storage/maria/ma_loghandler.c: Rename purify -> valgrind. storage/maria/ma_packrec.c: Rename purify -> valgrind. storage/maria/ma_page.c: Rename purify -> valgrind. storage/maria/ma_pagecrc.c: Rename purify -> valgrind. storage/maria/ma_search.c: Rename purify -> valgrind. storage/myisam/mi_check.c: Rename purify -> valgrind. storage/myisam/mi_page.c: Rename purify -> valgrind. storage/myisam/mi_search.c: Rename purify -> valgrind. storage/myisammrg/ha_myisammrg.cc: Rename purify -> valgrind. strings/bcmp.c: Rename purify -> valgrind. strings/decimal.c: Rename purify -> valgrind. strings/strmake.c: Rename purify -> valgrind.
* | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-4/+4
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | merge from parentDaniel Fischer2009-03-091-2/+2
| |\ \
| | * | Added to source package the file "mysql-test/suite/bugs/combinations"MySQL Build Team2009-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | and the directory "mysql-test/suite/jp/include"