=== modified file 'mysql-test/r/lowercase_table.result'
--- mysql-test/r/lowercase_table.result	2006-11-03 09:08:53 +0000
+++ mysql-test/r/lowercase_table.result	2014-03-13 13:43:13 +0000
@@ -108,3 +108,9 @@ ii
 drop table İİ;
 set names latin1;
 End of 5.0 tests
+create database mysql_TEST;
+show create database mysql_TEST;
+Database	Create Database
+mysql_TEST	CREATE DATABASE `mysql_TEST` /*!40100 DEFAULT CHARACTER SET latin1 */
+drop database mysql_TEST;
+End of 6.0 tests

=== modified file 'mysql-test/t/lowercase_table.test'
--- mysql-test/t/lowercase_table.test	2006-10-30 10:40:15 +0000
+++ mysql-test/t/lowercase_table.test	2014-03-13 13:43:13 +0000
@@ -105,3 +105,12 @@ drop table İİ;
 set names latin1;
 
 --echo End of 5.0 tests
+
+#
+# Bug#21317: SHOW CREATE DATABASE does not obey to lower_case_table_names
+#
+create database mysql_TEST;
+show create database mysql_TEST;
+drop database mysql_TEST;
+
+--echo End of 6.0 tests