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
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
1b75bed00f
5.5.40+ merge
2014-10-09 10:30:11 +02:00
c58f561e0d
MDEV-5707 MTR fails on kfreebsd
...
apply debian's patch to workaround kfreebsd bug
2014-10-02 12:57:20 +02:00
93b50e64a0
cleanup: remove galera/wsrep magic from mtr
2014-10-01 23:38:27 +02:00
3620910eea
cleanup: galera merge, simple changes
2014-10-01 23:38:27 +02:00
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
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
40da8545a2
MDEV-6280 can't skip test with slash in its name
2014-06-02 13:33:41 +02:00
d3e2e1243b
5.5 merge
2014-05-09 12:35:11 +02:00
2f60292aa4
Options option_name=0 in combination files were processed incorrectly
2014-03-31 18:04:05 +04:00
cb67dcb618
mysql-5.5.37 selective merge
2014-03-27 22:26:58 +01:00
0dc23679c8
10.0-base merge
2014-02-26 15:28:07 +01:00
0b9a0a3517
5.5 merge
2014-02-25 16:04:35 +01:00
075a2fb716
Updated/added copyright header. Added line "use is subject to license terms"
...
to copyright header.
2014-02-17 18:19:04 +05:30
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
ceae5aaa7e
mtr: allow nested plugin suites to be defaults too
2014-02-06 16:25:18 +01:00
c92223e198
Updated/added copyright headers
2014-01-06 10:52:35 +05:30
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
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +01:00
6bf10fac44
5.5 merge
2013-12-15 15:57:26 +01:00
b16e67fd9c
install and package plugin suites.
2013-11-27 21:58:47 +01:00
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
c6d30805db
5.5 merge
2013-11-23 00:50:54 +01:00
fa3f8a18b2
mysql-5.5.34 merge
...
(some patches reverted, test case added)
2013-11-19 13:16:25 +01:00
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
4ec2e9d7ed
5.5 merge and fixes for compiler/test errors
2013-09-18 13:07:31 +02:00
940f554207
Merge from 5.3
...
pending merges:
Alexander Barkov 2013-09-16 backport from 10.0
2013-09-16 16:05:53 +04:00
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
6ee207a515
support ./mtr suite.test,com,bi,na,tions syntax
2013-09-11 15:35:49 +02:00
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
5f6380adde
10.0-base merge
2013-07-18 16:46:57 +02:00
97e640b9ae
5.5 merge
2013-07-17 21:24:29 +02:00
010bcf8ddf
upmerge bug 17035577 5.1 => 5.5
2013-07-17 14:25:09 +05:30
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
005c7e5421
mysql-5.5.32 merge
2013-07-16 19:09:54 +02:00
639a766096
5.2 merge
2013-05-20 11:13:07 +02:00
cbd300e7b0
Fix cpack error - safe_process.pl does not exist anymore.
2013-05-19 16:22:33 +02:00
d0d05dae07
Merge 10.0-base -> 10.0
2013-05-03 12:10:16 +02:00
eb75edfb2b
Instead of writing "Errcode" to the log for Slave errors, use "Internal 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"
2013-05-03 01:54:47 +03:00
45912599ca
10.0 merge
2013-04-19 20:35:04 +02:00
53375573e3
small mtr cleanup
...
and move the connect suite into storage/connect/
2013-04-19 07:07:06 +02:00
899b219e05
Bug #16632543 - INCORRECT VALUE OF BOGOMIPS IN MYSQLTEST
2013-04-16 16:26:45 +05:30
a9035be5b7
10.0-base merge
2013-04-15 15:09:22 +02:00
e7036ec1a2
mtr bug: files outside of both the suite dir and the overlay dir, were
...
treated as coming from the overlay.
(example: archive suite, test_sql_discovery overlay, mysql-test/include/have_archive.inc)
2013-04-07 14:51:16 +02:00
a24ca4153e
Bug #16401597 - MTR V1 RETURNS INCORRECT PATH TO VARIABLE @@BASEDIR
2013-04-04 14:54:16 +05:30
24b1ef8dae
Bug#11765629 CMAKE: CAN SUPPRESS INSTALLATION OF SQL-BENCH, BUT NOT MYSQL-TEST
...
Don't try to install anything into INSTALL_MYSQLTESTDIR
if it is explicitly set empty on the cmake command line.
2013-04-02 11:14:39 +02:00
af0e25725e
Bug #16403186 - MTR ON WINDOWS SHOULD NOT TRY TO START CDB IF RUNNING WITH PARALLEL
2013-03-28 11:47:43 +05:30
8afe262ae5
Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER
2013-03-19 15:53:48 +01:00
c4341d5095
5.2 -> 5.3
2013-02-28 21:48:47 +01:00
