From 5fdd9c99c246c27f92f85e9919dea2ed537d460d Mon Sep 17 00:00:00 2001
From: Sergey Glukhov <Sergey.Glukhov@sun.com>
Date: Wed, 10 Dec 2008 18:38:27 +0400
Subject: [PATCH] Bug#35275 INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS omits
 KEY_BLOCK_SIZE Added KEY_BLOCK_SIZE option to I_S.TABLES.CREATE_OPTIONS field

---
 mysql-test/r/information_schema.result | 5 +++++
 mysql-test/t/information_schema.test   | 7 +++++++
 sql/sql_show.cc                        | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 85af461eb14..4fd0bdde063 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1707,4 +1707,9 @@ where a.VARIABLE_NAME = b.VARIABLE_NAME;
 a.VARIABLE_VALUE - b.VARIABLE_VALUE
 2
 drop table t0;
+CREATE TABLE t1(a INT) KEY_BLOCK_SIZE=1;
+SELECT CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1';
+CREATE_OPTIONS
+KEY_BLOCK_SIZE=1
+DROP TABLE t1;
 End of 5.1 tests.
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index bcb22c44076..3dbdf76c220 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1383,4 +1383,11 @@ select a.VARIABLE_VALUE - b.VARIABLE_VALUE from t0 b, information_schema.global_
    where a.VARIABLE_NAME = b.VARIABLE_NAME; 
 drop table t0;
 
+#
+# Bug#35275 INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS omits KEY_BLOCK_SIZE
+#
+CREATE TABLE t1(a INT) KEY_BLOCK_SIZE=1;
+SELECT CREATE_OPTIONS FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1';
+DROP TABLE t1;
+
 --echo End of 5.1 tests.
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a506429fb97..3fd06aba672 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -3589,6 +3589,11 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables,
                    (share->transactional == HA_CHOICE_YES ? "1" : "0"),
                    NullS);
     }
+    if (share->key_block_size)
+    {
+      ptr= strmov(ptr, " KEY_BLOCK_SIZE=");
+      ptr= longlong10_to_str(share->key_block_size, ptr, 10);
+    }
 #ifdef WITH_PARTITION_STORAGE_ENGINE
     if (is_partitioned)
       ptr= strmov(ptr, " partitioned");