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
3495801e2e
5.5 merge
2014-11-19 17:23:39 +01:00
116baede50
Sporadic failure in storage_engine/trx.xa_recovery test
...
The test complains that the server failed to disappear upon shutdown /
wait_for_disconnect. Trying to solve the probably race condition by
adding a wait before restart.
2014-11-17 20:10:57 +04:00
f62c12b405
Merge 10.0.14 into 10.1
2014-10-15 12:59:13 +02:00
5c33632b50
engine_condition_pushdown has been deprecated
2014-10-12 14:26:27 +04:00
b41d5aebcf
Changes in storage_engine test suite:
...
- added more logic for ON DUPICATE KEY UPDATE upon Monty's request;
- added an overlay for XtraDB
2014-09-15 20:33:11 +04:00
e068b7dc40
Intentional change in logging
2014-02-05 16:39:21 +04:00
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +01:00
c6d30805db
5.5 merge
2013-11-23 00:50:54 +01:00
253ed701e9
A fix for MySQL#65146 introduced a new warning.
...
Minor wording changes in skip messages.
2013-11-28 19:54:07 +04:00
972b9f4ee2
Workaround for the delayed InnoDB error messages in the log file
2013-11-13 22:28:26 +04:00
55e9bfd4d9
Windows-specific suppression and perl problems
2013-11-12 02:19:27 +04:00
e0f7f8242d
Fixes for Windows and different time zones
2013-11-11 23:40:40 +04:00
ae62e19f27
Various changes coming from 5.6
2013-11-08 23:25:06 +04:00
54b443b9aa
Some system tables have InnoDB engine
2013-11-08 23:24:27 +04:00
317efa2a45
Semantics of ALTER ONLINE changed to mirror ALTER .. LOCK=NONE
2013-11-08 23:23:35 +04:00
aefded6302
Duplicate warnings were removed
2013-11-08 23:21:58 +04:00
66ed34d6ed
More comprehensive error messages and codes
2013-11-08 23:21:26 +04:00
eddc1325cb
Undefined engine is not necessarily an error, removed the prefix
2013-11-07 03:49:13 +04:00
71c56e6e45
.frm file is intact, so the absence of the error message seems
...
to be correct
2013-11-07 03:45:56 +04:00
cdecd86a53
More verbose error messages
2013-11-07 03:36:53 +04:00
35b2883643
merge 5.5 -> 10.0-base
2013-08-20 14:48:29 +03:00
32e56e7e14
The test was non-deterministic while choosing an alternative storage
...
engine
2013-08-05 18:42:22 +04:00
f596d28df6
Deliberate change in behavior introduced along with the fix for MDEV-4310
2013-08-05 18:30:12 +04:00
6b97512b21
Add missing check for thd->killed in mysql_binlog_send().
...
The slave dump thread running on the master only checked thd->killed whenever
it reached the end of a binlog file, not between events. This could
unnecessarily delay server shutdown.
This was found by code inspection while tracking down some occasional "forcing
close of thread..." errors in Buildbot. Hopefully this will fix the failures,
but the fix is correct in any case.
Also increase the wait during server shutdown, 2 seconds is a bit tight in
case of heavy I/O stall, and it seems better to delay shutdown a bit than
force-kill threads unnecessarily.
Also fix some races in test cases that restart the mysqld server. The .expect
file should be changed with --append_file, --remove_file + --write_file
creates a short window where mysqld can error out due to .expect file missing.
2013-04-24 13:05:40 +02:00
993ea79f2d
5.5 merge
2013-03-27 23:41:02 +01:00
7f444caa0a
MDEV-4028 - Converted rdiff files to uniform
...
MDEV-11 - Modifed tests and result files to use explicit column lists
in INSERT and SELECT statements
2013-02-03 02:53:57 +04:00
7269530938
MDEV-3990: engine tests went out of sync with current MariaDB code
...
Reasons:
alter_tablespace.rdiff:
tc_rename_error.result:
from monty@askmonty.org-20120529213755-876ptdhhaj0t7l8r
(Added text for errno in error messages)
insert_time.result:
from sergii@pisem.net-20120908101555-37w00eyfrd9noc06
(MDEV-457 - Inconsistent data truncation)
misc.result:
from igor@askmonty.org-20130109033433-5awdv0w6vbpigltw
(MDEV-3806/mwl248 - Engine independent statistics)
tbl_opt_row_format.rdiff:
from monty@askmonty.org-20120706161018-y5teinbuqpchle2m
(Fixed wrong error codes)
vcol.rdiff:
sergii@pisem.net-20121217100039-ikj1820nrku7p6d5
(simplify the handler api)
2013-01-13 17:01:34 +04:00
2371b6df3f
storage_engine tests and upstream engines/* suites went out of sync with current MariaDB code. Reasons:
...
- as of 5.5.27, YEAR(2) is deprecated, hence the new warning;
- MDEV-553 - different error code/message on out-of-range autoincrement;
- INSERT IGNORE now produces a warning if a duplicate was encountered (change pushed along with MDEV-553)
2012-12-28 17:02:33 +04:00
72a5542f0e
MDEV-11: Generic storage engine test suite
2012-07-16 06:17:56 +04:00
