summaryrefslogtreecommitdiff
path: root/mysql-test/lib/My
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-5/+13
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-03-061-5/+13
| |\
| | * MDEV-7659 buildbot may leave stale mysqldSergei Golubchik2015-03-061-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safe_process puts its children (mysqld, in this case) into a separate process group, to be able to kill it all at once. buildslave kills mtr's process group when it loses connection to the master. result? buildslave kills mtr and safe_process, but leaves stale mysqld processes in their own process groups. fix: put safe_process itself into a separate process group, then buildslave won't kill it and safe_process will kill mysqld'd and itself when it will notice that the parent mtr no longer exists.
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-312-0/+4
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-212-0/+4
| |\ \ | | |/
| | * MDEV-7448 - mtr may leave stale mysqldSergey Vojtovich2015-01-142-0/+4
| | | | | | | | | | | | | | | | | | Let mtr handle SIGHUP the same way as SIGINT. This solves stale mysqld processes left after broken/closed ssh connection.
* | | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .bzrignore VERSION cmake/plugin.cmake debian/dist/Debian/control debian/dist/Ubuntu/control mysql-test/r/join_outer.result mysql-test/r/join_outer_jcl6.result mysql-test/r/null.result mysql-test/r/old-mode.result mysql-test/r/union.result mysql-test/t/join_outer.test mysql-test/t/null.test mysql-test/t/old-mode.test mysql-test/t/union.test packaging/rpm-oel/mysql.spec.in scripts/mysql_config.sh sql/ha_ndbcluster.cc sql/ha_ndbcluster_binlog.cc sql/ha_ndbcluster_cond.cc sql/item_cmpfunc.h sql/lock.cc sql/sql_select.cc sql/sql_show.cc sql/sql_update.cc sql/sql_yacc.yy storage/innobase/buf/buf0flu.cc storage/innobase/fil/fil0fil.cc storage/innobase/include/srv0srv.h storage/innobase/lock/lock0lock.cc storage/tokudb/CMakeLists.txt storage/xtradb/buf/buf0flu.cc storage/xtradb/fil/fil0fil.cc storage/xtradb/include/srv0srv.h storage/xtradb/lock/lock0lock.cc support-files/mysql.spec.sh
| * | 5.5.40+ mergeSergei Golubchik2014-10-091-0/+2
| |\ \ | | |/
| | * MDEV-5707 MTR fails on kfreebsdSergei Golubchik2014-10-021-0/+2
| | | | | | | | | | | | apply debian's patch to workaround kfreebsd bug
* | | MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-111-156/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-3/+0
| | |
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+3
|/ / | | | | | | | | | | | | | | | | Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.
* | Options option_name=0 in combination files were processed incorrectlyElena Stepanova2014-03-311-1/+1
| |
* | 10.0-base mergeSergei Golubchik2014-02-262-3/+2
|\ \ | |/
| * MySQL-5.5.36 mergeSergei Golubchik2014-02-172-3/+2
| |\ | | | | | | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| | * Updated/added copyright headersMurthy Narkedimilli2014-01-062-3/+2
| | |
* | | 10.0-base mergeSergei Golubchik2013-12-161-0/+1
|\ \ \ | |/ /
| * | mysql-test: allow suite.pm add its suite to the default list.Sergei Golubchik2013-11-271-0/+1
| | | | | | | | | | | | | | | | | | run tokudb suites by default. mark big and slow tests tokudb.change_column_all_1000_1 and tokudb.change_column_all_1000_10 test as --big
| * | Merge from 5.3Alexander Barkov2013-09-161-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | pending merges: Alexander Barkov 2013-09-16 backport from 10.0
| | * | backport from 10.0Alexander Barkov2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mtr can crash occasionally. This happens when mtr sends to a child mtr process (or vice-versa) a packet, that gets truncated or, perhaps, split in two. Then the other side cannot deserialize it and fails as above.
| | * | Fix cpack error - safe_process.pl does not exist anymore.Vladislav Vaintroub2013-05-191-1/+1
| | | |
| | * | 5.1 -> 5.2 mergeSergei Golubchik2013-02-282-170/+11
| | |\ \
| | | * \ mysql-5.1 mergeSergei Golubchik2013-02-282-170/+11
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | \ \ 5.1 mergeSergei Golubchik2012-08-221-3/+4
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | increase xtradb verson from 13.0 to 13.01
| | | * | | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-3/+4
| | | |\ \ \
* | | | \ \ \ 10.0-base mergeSergei Golubchik2013-07-184-10/+26
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 5.5 mergeSergei Golubchik2013-07-174-10/+26
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mysql-5.5.32 mergeSergei Golubchik2013-07-164-10/+26
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Bug #16632543 - INCORRECT VALUE OF BOGOMIPS IN MYSQLTESTsayantan dutta2013-04-161-2/+2
| | | | | | | |
| | | * | | | | Bug#11765629 CMAKE: CAN SUPPRESS INSTALLATION OF SQL-BENCH, BUT NOT MYSQL-TESTTor Didriksen2013-04-021-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to install anything into INSTALL_MYSQLTESTDIR if it is explicitly set empty on the cmake command line.
| | | * | | | | Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH ↵sayantan dutta2013-03-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PARALLEL
| | | * | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-191-1/+1
| | | | | | | |
| * | | | | | | Instead of writing "Errcode" to the log for Slave errors, use "Internal ↵Michael Widenius2013-05-031-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MariaDB error code" This makes it clear that the error code has nothing to do with errno. mysql-test/include/mtr_warnings.sql: Fixed suppression for new slave error messages mysql-test/lib/My/Test.pm: Use 'send' instead of 'print' to avoid errors about "wrong class ... back attempt" mysql-test/lib/v1/mtr_report.pl: Fixed suppression for new slave error messages mysql-test/mysql-test-run.pl: Fixed suppression for new slave error messages Removed warning from perl 5.16.2 about arrays mysql-test/r/flush_read_lock.result: Fixed suppression for new slave error messages sql/rpl_reporting.cc: Instead of writing "Errcode" to the log for Slave errors, use "Internal MariaDB error code"
* | | | | | | 10.0 mergeSergei Golubchik2013-04-193-171/+12
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ 10.0-base mergeSergei Golubchik2013-04-153-171/+12
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-283-171/+12
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Reinstate install of mysql-test/lib/My/SafeProcess/Base.pm, removed by mistakeBjorn Munch2012-11-261-0/+1
| | | | | | | |
| | | * | | | | upmerge 5.1 => 5.5unknown2012-11-263-171/+11
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Bug #14757120 - SAFE_PROCESS.CC/SAFE_PROCESS.PL SHOULD NOT KILL MYSQLD ON ↵unknown2012-11-262-170/+11
| | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | SIGSTOP/SIGCONT
| | | * | | | Upmerge optional testsuite pathBjorn Munch2012-05-151-3/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Added some extra optional path to test suitesBjorn Munch2012-05-151-3/+4
| | | | | | |
* | | | | | | small mtr cleanupSergei Golubchik2013-04-191-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | and move the connect suite into storage/connect/
* | | | | | fixes for test failuresSergei Golubchik2012-09-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and small collateral changes mysql-test/lib/My/Test.pm: somehow with "print" we get truncated writes sometimes mysql-test/suite/perfschema/r/digest_table_full.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/dml_handler.result: host table is not ported over yet mysql-test/suite/perfschema/r/information_schema.result: host table is not ported over yet mysql-test/suite/perfschema/r/nesting.result: this differs, because we don't rewrite general log queries, and multi-statement packets are logged as a one entry. this result file is identical to what mysql-5.6.5 produces with the --log-raw option. mysql-test/suite/perfschema/r/relaylog.result: MariaDB modifies the binlog index file directly, while MySQL 5.6 has a feature "crash-safe binlog index" and modifies a special "crash-safe" shadow copy of the index file and then moves it over. That's why this test shows "NONE" index file writes in MySQL and "MANY" in MariaDB. mysql-test/suite/perfschema/r/server_init.result: MariaDB initializes the "manager" resources from the "manager" thread, and starts this thread only when --flush-time is not 0. MySQL 5.6 initializes "manager" resources unconditionally on server startup. mysql-test/suite/perfschema/r/stage_mdl_global.result: this differs, because MariaDB disables query cache when query_cache_size=0. MySQL does not do that, and this causes useless mutex locks and waits. mysql-test/suite/perfschema/r/statement_digest.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_consumers.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/perfschema/r/statement_digest_long_query.result: md5 hashes of statement digests differ, because yacc token codes are different in mariadb mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result: will be updated to match 5.6 when alfranio.correia@oracle.com-20110512172919-c1b5kmum4h52g0ni and anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y are merged mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result: will be updated to match 5.6 when anders.song@greatopensource.com-20110105052107-zoab0bsf5a6xxk2y is merged
* | | | | | Fixing test casesMichael Widenius2012-08-231-1/+2
|/ / / / / | | | | | | | | | | | | | | | Added missing system tables used in 5.6
* | | | | 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
| | | | |
View Lorry Controller Status