=== modified file 'mysql-test/r/alter_table_online.result'
--- mysql-test/r/alter_table_online.result	2013-11-20 11:05:39 +0000
+++ mysql-test/r/alter_table_online.result	2014-12-29 13:28:09 +0000
@@ -11,6 +11,7 @@
 ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
 alter online table t1 rename to t2;
 ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+alter online table t1 algorithm=INPLACE, lock=NONE;
 drop table t1;
 create temporary table t1 (a int not null primary key, b int, c varchar(80), e enum('a','b'));
 insert into t1 (a) values (1),(2),(3);

=== modified file 'mysql-test/t/alter_table_online.test'
--- mysql-test/t/alter_table_online.test	2013-11-20 11:05:39 +0000
+++ mysql-test/t/alter_table_online.test	2014-12-29 13:27:16 +0000
@@ -7,7 +7,7 @@
 drop table if exists t1,t2,t3;
 --enable_warnings
 #
-# Test of things that can be done online
+# Test of things that can no be done online
 #
 
 create table t1 (a int not null primary key, b int, c varchar(80), e enum('a','b'));
@@ -24,6 +24,10 @@
 --error ER_ALTER_OPERATION_NOT_SUPPORTED
 alter online table t1 rename to t2;
 
+# No OPs
+
+alter online table t1 algorithm=INPLACE, lock=NONE;
+
 drop table t1;
 
 #

=== modified file 'sql/sql_table.cc'
--- sql/sql_table.cc	2014-11-18 21:25:33 +0000
+++ sql/sql_table.cc	2014-12-29 13:38:49 +0000
@@ -8417,6 +8417,7 @@
   THD_STAGE_INFO(thd, stage_setup);
   if (!(alter_info->flags & ~(Alter_info::ALTER_RENAME |
                               Alter_info::ALTER_KEYS_ONOFF)) &&
+      alter_info->flags != 0 &&
       alter_info->requested_algorithm !=
       Alter_info::ALTER_TABLE_ALGORITHM_COPY &&
       !table->s->tmp_table) // no need to touch frm
@@ -8435,7 +8436,8 @@
     DBUG_RETURN(res);
   }
 
-  handle_if_exists_options(thd, table, alter_info);
+  if (alter_info->flags != 0)
+    handle_if_exists_options(thd, table, alter_info);
 
   /*
     Look if we have to do anything at all.