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

2 files changed, 44 insertions, 2 deletions

diff --git a/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff b/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff
new file mode 100644
index 00000000000..c21211560e9
--- /dev/null
+++ b/storage/myisammrg/mysql-test/storage_engine/alter_table_online.rdiff
@@ -0,0 +1,44 @@
+--- suite/storage_engine/alter_table_online.result	2014-09-25 12:15:42.000000000 +0400
++++ suite/storage_engine/alter_table_online.reject	2014-11-17 20:25:16.000000000 +0400
+@@ -9,20 +9,35 @@
+ CREATE TEMPORARY TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b'),(3,'c');
+ ALTER ONLINE TABLE t1 MODIFY b <INT_COLUMN> DEFAULT 5;
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
++# ------------ UNEXPECTED RESULT ------------
++# The statement|command succeeded unexpectedly.
++# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
++# Also, this problem may cause a chain effect (more errors of different kinds in the test).
++# -------------------------------------------
+ ALTER ONLINE TABLE t1 CHANGE b new_name <INT_COLUMN>;
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
+ ALTER ONLINE TABLE t1 COMMENT 'new comment';
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
+ ALTER ONLINE TABLE t1 RENAME TO t2;
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
+ DROP TABLE t1;
++ERROR 42S02: Unknown table 't1'
+ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN>, c <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
+ INSERT INTO t1 (a,b,c) VALUES (1,100,'a'),(2,200,'b'),(3,300,'c');
+ ALTER ONLINE TABLE t1 DROP COLUMN b, ADD b <INT_COLUMN>;
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
++# ------------ UNEXPECTED RESULT ------------
++# The statement|command succeeded unexpectedly.
++# Functionality or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
++# Also, this problem may cause a chain effect (more errors of different kinds in the test).
++# -------------------------------------------
+ ALTER ONLINE TABLE t1 MODIFY b BIGINT <CUSTOM_COL_OPTIONS>;
+-ERROR HY000: Can't execute the given 'ALTER' command as online
++# ERROR: Statement succeeded (expected results: ER_CANT_DO_ONLINE)
+ ALTER ONLINE TABLE t1 ENGINE=MEMORY;
+ ERROR HY000: Can't execute the given 'ALTER' command as online
+ DROP TABLE t1;
diff --git a/storage/myisammrg/mysql-test/storage_engine/disabled.def b/storage/myisammrg/mysql-test/storage_engine/disabled.def
deleted file mode 100644
index 86b96c2ba2b..00000000000
--- a/storage/myisammrg/mysql-test/storage_engine/disabled.def
+++ /dev/null
@@ -1,2 +0,0 @@
-alter_table_online : MDEV-5266 (Temporary MERGE table with temporary underlying is broken by ALTER)
-