Sergei Golubchik
e9b6f95013
test failure
2015-09-04 16:30:11 +02:00
Sergei Golubchik
5091a4ba75
Merge tag 'mariadb-10.0.19' into 10.1
2015-06-01 15:51:25 +02:00
Sergei Golubchik
49c853fb94
Merge branch '5.5' into 10.0
2015-05-04 22:00:24 +02:00
Sergei Golubchik
18215dd9fa
MDEV-7859 SSL hostname verification fails for long subject names
...
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.
2015-04-27 15:42:12 +02:00
Sergei Golubchik
32e5304bff
mtr: fix testname,combination syntax to work in many-combination case
...
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
2015-04-08 10:58:49 +02:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
5f510a9175
Merge branch '5.5' into 10.0
2015-03-06 18:41:32 +01:00
Sergei Golubchik
12d87c3ba5
MDEV-7659 buildbot may leave stale mysqld
...
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.
2015-03-06 11:15:55 +01:00
Sergei Golubchik
4b21cd21fe
Merge branch '10.0' into merge-wip
2015-01-31 21:48:47 +01:00
Sergei Golubchik
27439ee6ea
5.5 merge
2015-01-29 18:26:07 +01:00
Sergei Golubchik
5f63c9c067
recreate expired certificates for SSL tests
...
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
2015-01-29 14:34:31 +01:00
Sergei Golubchik
d9c01e4b4a
5.5 merge
2015-01-21 12:03:02 +01:00
Sergey Vojtovich
ca6b86f420
MDEV-7448 - mtr may leave stale mysqld
...
Let mtr handle SIGHUP the same way as SIGINT. This solves stale mysqld processes
left after broken/closed ssh connection.
2015-01-14 17:50:38 +04:00
Sergei Golubchik
853077ad7e
Merge branch '10.0' into bb-10.1-merge
...
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
2014-12-02 22:25:16 +01:00
Sergei Golubchik
7f5e51b940
MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)
...
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
2014-10-11 18:53:06 +02:00
Sergei Golubchik
1b75bed00f
5.5.40+ merge
2014-10-09 10:30:11 +02:00
Sergei Golubchik
c58f561e0d
MDEV-5707 MTR fails on kfreebsd
...
apply debian's patch to workaround kfreebsd bug
2014-10-02 12:57:20 +02:00
Sergei Golubchik
93b50e64a0
cleanup: remove galera/wsrep magic from mtr
2014-10-01 23:38:27 +02:00
Sergei Golubchik
3620910eea
cleanup: galera merge, simple changes
2014-10-01 23:38:27 +02:00
Jan Lindström
df4dd593f2
MDEV-6247: Merge 10.0-galera to 10.1.
...
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.
2014-08-26 15:43:46 +03:00
Sergei Golubchik
cf1a09e42f
MDEV-6107 merge default_tmp_storage_engine
...
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.
2014-06-15 18:42:31 +02:00
Sergei Golubchik
40da8545a2
MDEV-6280 can't skip test with slash in its name
2014-06-02 13:33:41 +02:00
Sergei Golubchik
d3e2e1243b
5.5 merge
2014-05-09 12:35:11 +02:00
Elena Stepanova
2f60292aa4
Options option_name=0 in combination files were processed incorrectly
2014-03-31 18:04:05 +04:00
Sergei Golubchik
cb67dcb618
mysql-5.5.37 selective merge
2014-03-27 22:26:58 +01:00
Sergei Golubchik
0dc23679c8
10.0-base merge
2014-02-26 15:28:07 +01:00
Sergei Golubchik
0b9a0a3517
5.5 merge
2014-02-25 16:04:35 +01:00
Murthy Narkedimilli
075a2fb716
Updated/added copyright header. Added line "use is subject to license terms"
...
to copyright header.
2014-02-17 18:19:04 +05:30
Sergei Golubchik
84651126c0
MySQL-5.5.36 merge
...
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
2014-02-17 11:00:51 +01:00
Sergei Golubchik
ceae5aaa7e
mtr: allow nested plugin suites to be defaults too
2014-02-06 16:25:18 +01:00
Murthy Narkedimilli
c92223e198
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
Sergei Golubchik
91b82a0f73
mtr: abort when a suite.pm fails to load, don't just ignore the errors.
...
Fix all suite.pm files that had errors and test files that were skipped because of that
2013-12-22 17:14:05 +01:00
Sergei Golubchik
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +01:00
Sergei Golubchik
6bf10fac44
5.5 merge
2013-12-15 15:57:26 +01:00
Sergei Golubchik
b16e67fd9c
install and package plugin suites.
2013-11-27 21:58:47 +01:00
Sergei Golubchik
c2839e2cf2
mysql-test: allow suite.pm add its suite to the default list.
...
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
2013-11-27 21:58:36 +01:00
Sergei Golubchik
c6d30805db
5.5 merge
2013-11-23 00:50:54 +01:00
Sergei Golubchik
fa3f8a18b2
mysql-5.5.34 merge
...
(some patches reverted, test case added)
2013-11-19 13:16:25 +01:00
Sergei Golubchik
9af177042e
10.0-base merge.
...
Partitioning/InnoDB changes are *not* merged (they'll come from 5.6)
TokuDB does not compile (not updated to 10.0 SE API)
2013-09-21 10:14:42 +02:00
Sergei Golubchik
4ec2e9d7ed
5.5 merge and fixes for compiler/test errors
2013-09-18 13:07:31 +02:00
Alexander Barkov
940f554207
Merge from 5.3
...
pending merges:
Alexander Barkov 2013-09-16 backport from 10.0
2013-09-16 16:05:53 +04:00
Alexander Barkov
779003e180
backport from 10.0
...
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.
2013-09-16 16:03:55 +04:00
Sergei Golubchik
6ee207a515
support ./mtr suite.test,com,bi,na,tions syntax
2013-09-11 15:35:49 +02:00
Sergei Golubchik
38e2340a8e
mtr bug: files outside of both the suite dir and the overlay dir, were
...
treated as coming from the overlay.
2013-08-26 21:14:01 +04:00
Sergei Golubchik
5f6380adde
10.0-base merge
2013-07-18 16:46:57 +02:00
Sergei Golubchik
97e640b9ae
5.5 merge
2013-07-17 21:24:29 +02:00
sayantan dutta
010bcf8ddf
upmerge bug 17035577 5.1 => 5.5
2013-07-17 14:25:09 +05:30
sayantan dutta
c088c9c4c5
Bug #17035577 - MTR V1 FAILS TO START SERVER MTR_VERSION=1 PERL MYSQL-TEST-RUN.PL 1ST
2013-07-17 14:24:02 +05:30
Sergei Golubchik
005c7e5421
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
Sergei Golubchik
639a766096
5.2 merge
2013-05-20 11:13:07 +02:00
