summaryrefslogtreecommitdiff
path: root/mysql-test/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-6/+5
|\
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-041-6/+5
| |\
| | * MDEV-7859 SSL hostname verification fails for long subject namesSergei Golubchik2015-04-271-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Don't use a fixed buffer for X509_NAME_oneline() in the client. Do as the server does - allocate it dynamically. For a test - regenerate certificates to have the server cert with a long subject.
* | | mtr: fix testname,combination syntax to work in many-combination caseSergei Golubchik2015-04-081-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in particular, "innodb.innodb-page_encryption,xtradb" should select these three tests: innodb.innodb-page_encryption 'cbc,xtradb' [ pass ] 35563 innodb.innodb-page_encryption 'ctr,xtradb' [ pass ] 36858 innodb.innodb-page_encryption 'ecb,xtradb' [ pass ] 36741 and deselect all innodb_plugin tests. This was not the case, because the %test_combs hash was destructively modified in the loop
* | | 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-313-0/+35
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-291-0/+31
| |\ \ | | |/
| | * recreate expired certificates for SSL testsSergei Golubchik2015-01-291-0/+31
| | | | | | | | | | | | | | | added a script to regenerate certificates easily in the future (2035!) restored server8k-key.pem to actually be 8K key, as it was supposed to
| * | 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-118-1633/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* | | cleanup: remove galera/wsrep magic from mtrSergei Golubchik2014-10-011-3/+0
| | |
* | | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-3/+0
| | |
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-262-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | MDEV-6107 merge default_tmp_storage_engineSergei Golubchik2014-06-151-1/+0
|/ / | | | | | | | | | | | | Adapt default_tmp_storage_engine implementation from mysql-5.6 New feature (as compared to 5.6), default_tmp_storage_engine=NULL means that temporary tables will use default_storage_engine value. This makes the behavior backward compatible.
* | MDEV-6280 can't skip test with slash in its nameSergei Golubchik2014-06-021-1/+1
| |
* | 5.5 mergeSergei Golubchik2014-05-091-0/+1
|\ \ | |/
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+1
| |\
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | | | | | | | | | | | | | | to copyright header.
* | | Options option_name=0 in combination files were processed incorrectlyElena Stepanova2014-03-311-1/+1
| | |
* | | 10.0-base mergeSergei Golubchik2014-02-262-3/+2
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-252-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
| | | |
* | | | mtr: allow nested plugin suites to be defaults tooSergei Golubchik2014-02-061-6/+11
| | | |
* | | | mtr: abort when a suite.pm fails to load, don't just ignore the errors.Sergei Golubchik2013-12-221-0/+1
| | | | | | | | | | | | | | | | Fix all suite.pm files that had errors and test files that were skipped because of that
* | | | 10.0-base mergeSergei Golubchik2013-12-163-18/+52
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-152-17/+51
| |\ \ \ | | |/ /
| | * | install and package plugin suites.Sergei Golubchik2013-11-271-17/+28
| | | |
| | * | mysql-test: allow suite.pm add its suite to the default list.Sergei Golubchik2013-11-272-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 5.5 mergeSergei Golubchik2013-11-231-1/+1
| |\ \ \ | | |/ /
| | * | mysql-5.5.34 mergeSergei Golubchik2013-11-191-1/+1
| | |\ \ | | | |/ | | | | | | | | (some patches reverted, test case added)
| | | * upmerge bug 17035577 5.1 => 5.5sayantan dutta2013-07-171-1/+1
| | | |\
| | | | * Bug #17035577 - MTR V1 FAILS TO START SERVER MTR_VERSION=1 PERL ↵sayantan dutta2013-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | MYSQL-TEST-RUN.PL 1ST
| | | | * Updated/added copyright headers.Murthy Narkedimilli2013-02-256-6/+6
| | | | |
* | | | | 10.0-base merge.Sergei Golubchik2013-09-211-10/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Partitioning/InnoDB changes are *not* merged (they'll come from 5.6) TokuDB does not compile (not updated to 10.0 SE API)
| * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-10/+27
| |\ \ \ \ | | |/ / /
| | * | | 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.
| | | * | | 5.2 mergeSergei Golubchik2013-05-201-1/+1
| | | |\ \ \
| | | | * | | Fix cpack error - safe_process.pl does not exist anymore.Vladislav Vaintroub2013-05-191-1/+1
| | | | | | |
| | | * | | | 5.2 -> 5.3Sergei Golubchik2013-02-282-170/+11
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | 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.2 merge.Sergei Golubchik2012-08-222-6/+8
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | two tests still fail: main.innodb_icp and main.range_vs_index_merge_innodb call records_in_range() with both range ends being open (which triggers an assert)
View Lorry Controller Status