diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result
index 77d3cba63d5..edd49988a5f 100644
--- a/mysql-test/r/archive.result
+++ b/mysql-test/r/archive.result
@@ -2619,7 +2619,7 @@ auto	fld1	companynr	fld3	fld4	fld5	fld6
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
 INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-OPTIMIZE TABLE t2 EXTENDED;
+OPTIMIZE TABLE t2;
 Table	Op	Msg_type	Msg_text
 test.t2	optimize	status	OK
 SELECT * FROM t2;
diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 2b8c79b4563..7c25e948d6c 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -1297,4 +1297,14 @@ create table t1
 partition by key(s1) partitions 3;
 insert into t1 values (null,null);
 drop table t1;
+CREATE TABLE t1(a int)
+PARTITION BY RANGE (a) (
+PARTITION p1 VALUES LESS THAN (10),
+PARTITION p2 VALUES LESS THAN (20)
+);
+ALTER TABLE t1 OPTIMIZE PARTITION p1 EXTENDED;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1
+ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'EXTENDED' at line 1
+DROP TABLE t1;
 End of 5.1 tests
diff --git a/mysql-test/t/archive.test b/mysql-test/t/archive.test
index f8eff10e30a..a1158dbfd3b 100644
--- a/mysql-test/t/archive.test
+++ b/mysql-test/t/archive.test
@@ -1320,7 +1320,7 @@ SELECT * FROM t2;
 INSERT INTO t2 VALUES (2,011401,37,'breaking','dreaded','Steinberg','W');
 INSERT INTO t2 VALUES (3,011402,37,'Romans','scholastics','jarring','');
 INSERT INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');
-OPTIMIZE TABLE t2 EXTENDED;
+OPTIMIZE TABLE t2;
 SELECT * FROM t2;
 REPAIR TABLE t2;
 SELECT * FROM t2;
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 68eff608879..f2fed63c833 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1541,4 +1541,19 @@ while ($cnt)
 --enable_query_log
 
 drop table t1;
+
+#
+# Bug #30495: optimize table t1,t2,t3 extended errors
+#
+CREATE TABLE t1(a int)
+PARTITION BY RANGE (a) (
+  PARTITION p1 VALUES LESS THAN (10),
+  PARTITION p2 VALUES LESS THAN (20)
+);
+--error 1064
+ALTER TABLE t1 OPTIMIZE PARTITION p1 EXTENDED;
+--error 1064
+ALTER TABLE t1 ANALYZE PARTITION p1 EXTENDED;
+DROP TABLE t1;
+
 --echo End of 5.1 tests