Sergei Golubchik
|
4b21cd21fe
|
Merge branch '10.0' into merge-wip
|
2015-01-31 21:48:47 +01:00 |
|
Elena Stepanova
|
f7fed26390
|
Storage engines tests: ALTER ONLINE works differently for MERGE in 10.0
|
2014-12-05 21:38:16 +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
|
3495801e2e
|
5.5 merge
|
2014-11-19 17:23:39 +01:00 |
|
Elena Stepanova
|
b99328bbf8
|
Re-enabling tests disabled due to MDEV-5266 and MySQL:65225 (fixed now)
|
2014-11-17 20:28:18 +04:00 |
|
Elena Stepanova
|
5c33632b50
|
engine_condition_pushdown has been deprecated
|
2014-10-12 14:26:27 +04:00 |
|
Elena Stepanova
|
e068b7dc40
|
Intentional change in logging
|
2014-02-05 16:39:21 +04:00 |
|
Elena Stepanova
|
253ed701e9
|
A fix for MySQL#65146 introduced a new warning.
Minor wording changes in skip messages.
|
2013-11-28 19:54:07 +04:00 |
|
Elena Stepanova
|
ae62e19f27
|
Various changes coming from 5.6
|
2013-11-08 23:25:06 +04:00 |
|
Elena Stepanova
|
54b443b9aa
|
Some system tables have InnoDB engine
|
2013-11-08 23:24:27 +04:00 |
|
Elena Stepanova
|
317efa2a45
|
Semantics of ALTER ONLINE changed to mirror ALTER .. LOCK=NONE
|
2013-11-08 23:23:35 +04:00 |
|
Elena Stepanova
|
66ed34d6ed
|
More comprehensive error messages and codes
|
2013-11-08 23:21:26 +04:00 |
|
Elena Stepanova
|
71c56e6e45
|
.frm file is intact, so the absence of the error message seems
to be correct
|
2013-11-07 03:45:56 +04:00 |
|
Elena Stepanova
|
cdecd86a53
|
More verbose error messages
|
2013-11-07 03:36:53 +04:00 |
|
Elena Stepanova
|
f596d28df6
|
Deliberate change in behavior introduced along with the fix for MDEV-4310
|
2013-08-05 18:30:12 +04:00 |
|
Elena Stepanova
|
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 |
|
Elena Stepanova
|
72a5542f0e
|
MDEV-11: Generic storage engine test suite
|
2012-07-16 06:17:56 +04:00 |
|