summaryrefslogtreecommitdiff
path: root/mysql-test/Makefile.am
Commit message (Collapse)AuthorAgeFilesLines
* 5.2 -> 5.3Sergei Golubchik2013-02-281-2/+1
|\
| * 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-2/+1
| |\
| | * mysql-5.1 mergeSergei Golubchik2013-02-281-2/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysys/errors.c: revert upstream's fix. use a much simpler one mysys/my_write.c: revert upstream's fix. use a simpler one sql/item_xmlfunc.cc: useless, but ok sql/mysqld.cc: simplify upstream's fix storage/heap/hp_delete.c: remove upstream's fix. we'll use a much less expensive approach.
| | | * Bug #14757120 - SAFE_PROCESS.CC/SAFE_PROCESS.PL SHOULD NOT KILL MYSQLD ON ↵unknown2012-11-261-2/+1
| | | | | | | | | | | | | | | | SIGSTOP/SIGCONT
* | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-0/+1
|\ \ \ \ | |/ / /
| * | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-0/+1
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-0/+1
| | |\ \ | | | |/
| | | * Bug #12876932 - INCORRECT SELECT RESULT ON FEDERATED TABLEVenkata Sidagam2012-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | Fixed the missing of federated/include folder at the time of preparing package distribution, issue happens only in 5.1
* | | | Fixed that 'make distcheck' works with automake 1.11.11Michael Widenius2012-02-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings found by buildbot Makefile.am: Removed extra empty line cmd-line-utils/libedit/sys.h: Fixed that strndup() doesn't give compiler warnings mysql-test/Makefile.am: Fixes for 'make distcheck' plugin/auth_pam/auth_pam.c: Ensure that prototype for strndup() is included on linux sql/share/Makefile.am: Fixes for 'make distcheck' storage/innodb_plugin/btr/btr0sea.c: Fixed compiler warning support-files/Makefile.am: Fixes for 'make distcheck'
* | | | 5.2->5.3 mergeSergei Golubchik2011-12-121-1/+1
|\ \ \ \ | |/ / /
| * | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. dialog plugin now always returns mysql->password if non-empty and the first question is of password type 3. split get_tty_password into get_tty_password_buff and strdup. 4. dialog plugin now uses get_tty_password by default 5. dialog.test 6. moved small tests of individual plugins into a dedicated suite
* | | | Merge with 5.2.Michael Widenius2011-12-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | no_error handling for select (used by INSERT ... SELECT) still needs to be fixed, but I will do that in a separate commit
| * | | Merge with MariaDB 5.1Michael Widenius2011-11-241-1/+1
| |\ \ \ | | |/ /
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+1
| | |\ \ | | | |/ | | | | | | | | Fixed up copyright messages.
| | | * Updated/added copyright headersKent Boortz2011-07-031-2/+1
| | | |\
| | | | * Bug #11752142 43247: SUITE/<SUITE NAME>/INCLUDE: NO SUCH FILE OR DIRECTORYBjorn Munch2011-05-031-1/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | The originally reported dirs have been removed But found suite/bugs, removed from mysql-test/Makefile.am
| * | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ↵Michael Widenius2011-09-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | & my_malloc to mysqld error log if one sets log-warning to 10 or 11 The idea is that my_global_flags is ored to the MyFlags parameter for the above functions if the MY_WME flag is not set. As the my_global_flags has ME_JUST_INFO (mark error as 'note') and possible ME_NOREFRESH (write error to log) this will force mysqld to log the not critical error to the log as a note. include/my_sys.h: Moved MY_SYNC_DIR to ensure it never clashes with ME_JUST_INFO Added my_global_flags mysql-test/Makefile.am: Removed not used bugs directory mysys/my_init.c: Added my_global_flags, a variable that is ored to MyFlags in a those mysys functions we want extra logging. mysys/my_malloc.c: Added support for my_global_flags mysys/my_open.c: Added support for my_global_flags mysys/my_pread.c: Added support for my_global_flags mysys/my_read.c: Added support for my_global_flags mysys/my_static.c: Added my_global_flags mysys/my_write.c: Added support for my_global_flags sql/mysqld.cc: Set my_global_flags for warning levels 10 & 11 sql/sql_base.cc: Don't increment unhandled errors for notes or warnings.
* | | | 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
View Lorry Controller Status