diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result
index 2d8ff8d433f..f185522470d 100644
--- a/mysql-test/r/information_schema.result
+++ b/mysql-test/r/information_schema.result
@@ -1470,10 +1470,10 @@ f7	datetime	NO		NULL
 f8	datetime	YES		2006-01-01 00:00:00	
 drop table t1;
 End of 5.0 tests.
-show fields from information_schema.TABLE_NAMES;
-ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema
-show keys from information_schema.TABLE_NAMES;
-ERROR 42S02: Unknown table 'TABLE_NAMES' in information_schema
+show fields from information_schema.table_names;
+ERROR 42S02: Unknown table 'table_names' in information_schema
+show keys from information_schema.table_names;
+ERROR 42S02: Unknown table 'table_names' in information_schema
 select * from information_schema.engines WHERE ENGINE="MyISAM";
 ENGINE	SUPPORT	COMMENT	TRANSACTIONS	XA	SAVEPOINTS
 MyISAM	DEFAULT	Default engine as of MySQL 3.23 with great performance	NO	NO	NO
diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test
index 6edc2353fc0..96d510e2079 100644
--- a/mysql-test/t/information_schema.test
+++ b/mysql-test/t/information_schema.test
@@ -1095,10 +1095,9 @@ drop table t1;
 # Bug#30079 A check for "hidden" I_S tables is flawed
 #
 --error 1109
-show fields from information_schema.TABLE_NAMES;
+show fields from information_schema.table_names;
 --error 1109
-show keys from information_schema.TABLE_NAMES;
-
+show keys from information_schema.table_names;
 #
 # Show engines
 #
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index ac105855c02..c3dcc9950c0 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -2914,12 +2914,7 @@ void ha_partition::start_bulk_insert(ha_rows rows)
   handler **file;
   DBUG_ENTER("ha_partition::start_bulk_insert");
 
-  if (!rows)
-  {
-    /* Avoid allocation big caches in all underlaying handlers */
-    DBUG_VOID_RETURN;
-  }
-  rows= rows/m_tot_parts + 1;
+  rows= rows ? rows/m_tot_parts + 1 : 0;
   file= m_file;
   do
   {