Manual merge branch 'mysql-5.6' into mysql-5.7

of post-push fix for bug#19856162 including removal of
non-used HA_PARTITION_ONE_PHASE define and code.

Conflicts:
	sql/sql_partition.cc

Author: Mattias Jonsson

mysql-test/suite/ndb/r/ndb_partition_key.result

@@ -21,6 +21,7 @@ ERROR HY000: A PRIMARY KEY must include all columns in the table's partitioning
 CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))
 ENGINE = NDB
 PARTITION BY KEY (a);
+ALTER TABLE t1 REORGANIZE PARTITION;
 insert into t1 values 
 (1,1,3),(1,2,3),(1,3,3),(1,4,3),(1,5,3),(1,6,3),
 (1,7,3),(1,8,3),(1,9,3),(1,10,3),(1,11,3),(1,12,3);
@@ -322,8 +323,12 @@ a	b	c
 2	22	7
 ndb_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 ndb_pruned_scan_count
 0
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 Single partition scan
 select * from nott1 where a=0 order by c;
 a	b	c
@@ -333,15 +338,23 @@ a	b	c
 0	3	3
 ndb_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 ndb_pruned_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 Single partition scan
 select * from nott1 where a=4 order by c;
 a	b	c
 ndb_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 ndb_pruned_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 MRR scan on one partition
 select * from nott1 where a=0 and (( b > 0 and b < 3) or 
 ( b > 5 and b < 10) or 
@@ -351,8 +364,12 @@ a	b	c
 0	2	2
 ndb_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 ndb_pruned_scan_count
 1
+Warnings:
+Warning	1287	'INFORMATION_SCHEMA.SESSION_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.session_status instead
 drop table nott1;
 CREATE TABLE t1 (
 a char(10) NOT NULL,

mysql-test/suite/ndb/t/ndb_partition_key.test

@@ -37,6 +37,10 @@ CREATE TABLE t1 (a int, b int, c int, PRIMARY KEY(a,b))
   ENGINE = NDB
   PARTITION BY KEY (a);
 
+# Trigger assert from bug#19856162 with an alter table
+# not actually doing any changes to partitioniong
+ALTER TABLE t1 REORGANIZE PARTITION;
+
 insert into t1 values 
        (1,1,3),(1,2,3),(1,3,3),(1,4,3),(1,5,3),(1,6,3),
        (1,7,3),(1,8,3),(1,9,3),(1,10,3),(1,11,3),(1,12,3);

sql/partitioning/partition_handler.h

@@ -55,18 +55,9 @@ static const uint NO_CURRENT_PART_ID= UINT_MAX32;
   The new idea is that handlers will handle the lock level already in
   store_lock for ALTER TABLE partitions.
   TODO: Implement this via the alter-inplace api.
-
-  HA_PARTITION_ONE_PHASE is a flag that can be set by handlers that take
-  care of changing the partitions online and in one phase. Thus all phases
-  needed to handle the change are implemented inside the storage engine.
-  The storage engine must also support auto-discovery since the frm file
-  is changed as part of the change and this change must be controlled by
-  the storage engine. A typical engine to support this is NDB (through
-  WL #2498).
 */
 #define HA_PARTITION_FUNCTION_SUPPORTED         (1L << 0)
 #define HA_FAST_CHANGE_PARTITION                (1L << 1)
-#define HA_PARTITION_ONE_PHASE                  (1L << 2)
 
 enum enum_part_operation {
   OPTIMIZE_PARTS= 0,

sql/sql_partition.cc

@@ -4969,9 +4969,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
           without any changes at all.
         */
         flags= part_handler->alter_flags(alter_info->flags);
-        DBUG_ASSERT(flags & (HA_FAST_CHANGE_PARTITION |
-                             HA_PARTITION_ONE_PHASE));
-        if (flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE))
+        if ((flags & HA_FAST_CHANGE_PARTITION) != 0)
         {
           *new_part_info= tab_part_info;
           /* Force table re-open for consistency with the main case. */
@@ -5005,7 +5003,7 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
       my_error(ER_PARTITION_FUNCTION_FAILURE, MYF(0));
       goto err;
     }
-    if ((flags & (HA_FAST_CHANGE_PARTITION | HA_PARTITION_ONE_PHASE)) != 0)
+    if ((flags & HA_FAST_CHANGE_PARTITION) != 0)
     {
       /*
         "Fast" change of partitioning is supported in this case.
@@ -6825,58 +6823,7 @@ bool fast_alter_partition_table(THD *thd,
     my_error(ER_PARTITION_MGMT_ON_NONPARTITIONED, MYF(0));
     DBUG_RETURN(true);
   }
-  if (part_handler->alter_flags(alter_info->flags) & HA_PARTITION_ONE_PHASE)
-  {
-    /*
-      In the case where the engine supports one phase online partition
-      changes it is not necessary to have any exclusive locks. The
-      correctness is upheld instead by transactions being aborted if they
-      access the table after its partition definition has changed (if they
-      are still using the old partition definition).
-
-      The handler is in this case responsible to ensure that all users
-      start using the new frm file after it has changed. To implement
-      one phase it is necessary for the handler to have the master copy
-      of the frm file and use discovery mechanisms to renew it. Thus
-      write frm will write the frm, pack the new frm and finally
-      the frm is deleted and the discovery mechanisms will either restore
-      back to the old or installing the new after the change is activated.
-
-      Thus all open tables will be discovered that they are old, if not
-      earlier as soon as they try an operation using the old table. One
-      should ensure that this is checked already when opening a table,
-      even if it is found in the cache of open tables.
-
-      change_partitions will perform all operations and it is the duty of
-      the handler to ensure that the frm files in the system gets updated
-      in synch with the changes made and if an error occurs that a proper
-      error handling is done.
-
-      If the MySQL Server crashes at this moment but the handler succeeds
-      in performing the change then the binlog is not written for the
-      change. There is no way to solve this as long as the binlog is not
-      transactional and even then it is hard to solve it completely.
-
-      The first approach here was to downgrade locks. Now a different approach
-      is decided upon. The idea is that the handler will have access to the
-      Alter_info when store_lock arrives with TL_WRITE_ALLOW_READ. So if the
-      handler knows that this functionality can be handled with a lower lock
-      level it will set the lock level to TL_WRITE_ALLOW_WRITE immediately.
-      Thus the need to downgrade the lock disappears.
-      1) Write the new frm, pack it and then delete it
-      2) Perform the change within the handler
-    */
-    /* No engine supports this yet, so this is not yet tested! */
-    DBUG_ASSERT(0);
-    if (mysql_write_frm(lpt, WFRM_WRITE_SHADOW | WFRM_PACK_FRM) ||
-        mysql_change_partitions(lpt))
-    {
-      DBUG_RETURN(true);
-    }
-    fast_end_partition(thd, lpt->copied, lpt->deleted, table_list);
-    DBUG_RETURN(false);
-  }
-  else if (alter_info->flags & Alter_info::ALTER_DROP_PARTITION)
+  if (alter_info->flags & Alter_info::ALTER_DROP_PARTITION)
   {
     /*
       Now after all checks and setting state on dropped partitions we can