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
Elena Stepanova
570c771bc7
MDEV-7071 Spider tests fail due to an unknown option --skip-performance-schema on a build without perfschema
...
Made the option --loose
2014-11-12 05:52:53 +04:00
Sergei Golubchik
ab34aecff3
MDEV-6513 deprecate engine_condition_pushdown value of the @@optimizer_switch
...
* ignore the OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN bit
* issue a deprecation warning on 'engine_condition_pushdown=on'
* remove unused remains of the old pre-5.5 engine_condition_pushdown variable
2014-10-10 22:27:40 +02:00
Kentoku SHIBA
69a7022d59
fix wrong result for Spider test
2014-06-10 02:50:33 +09:00
Kentoku SHIBA
29cf8fb348
merge Spider 3.2.4
2014-06-08 19:52:11 +09:00
Sergei Golubchik
e8193eeb8d
skip performance_schema also in spider/bg suite
...
(as it was done for spider suite)
2014-02-06 21:58:38 +01:00
Elena Stepanova
625d9f4ef8
Spider tests failed in buildbot due to the lack of memory.
...
Turned off Performance Schema for Spider test suite
2014-02-05 03:51:18 +04:00
Sergei Golubchik
1df23d6f0f
mtr: print a detailed warning on a uninit assignment in the [ENV] group
...
spider suites: #varname is a valid syntax for a variable name, don't use it for comments
2013-12-25 10:13:15 +01:00
Sergei Golubchik
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +01:00
Kentoku SHIBA
0b914b39ef
fix MEDV-4736 Assertion `! is_set()' fails in Diagnostics_area::set_ok_status on UPDATE which violates constraint on a remote table
2013-09-30 05:11:44 +09:00
Kentoku SHIBA
0b4a89a152
fix MDEV-4949 Spider engine causes compilation errors if compiled without partitioning
2013-09-17 03:30:03 +09:00
Sergey Vojtovich
0b116de7c5
MDEV-4438 - Spider storage engine
2013-06-27 15:18:48 +04:00
