Don't enable HA_EXTRA_WRITE_CACHE if too few rows

Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()


sql/ha_myisam.cc:
  Don't enable HA_EXTRA_WRITE_CACHE if too few rows
sql/handler.h:
  Indentaion fix
sql/mysql_priv.h:
  Removed real_alter_table, mysql_add_column and mysql_drop_column
sql/sql_class.cc:
  After merge fix
sql/sql_insert.cc:
  Don't user bulk_insert if only one row (common case)
sql/sql_parse.cc:
  Added mysql_create_index() and mysql_drop_index() as these are only wrappers for mysql_alter_table()
sql/sql_table.cc:
  Revert main parts of patch for online index builds
  Changed back to use tabs to make merges possible between trees
sql/unireg.cc:
  Added comments and minor cleanup
strings/my_vsnprintf.c:
  Added support for %lx.
  Proper long support

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index c56009dc0aa..ca264f500a6 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -867,7 +867,9 @@ void ha_myisam::start_bulk_insert(ha_rows rows)
   THD *thd=current_thd;
   ulong size= min(thd->variables.read_buff_size, table->avg_row_length*rows);
 
-  mi_extra(file, HA_EXTRA_WRITE_CACHE, (void*)&size);
+  /* don't enable row cache if too few rows */
+  if (!rows && rows > 10)
+    mi_extra(file, HA_EXTRA_WRITE_CACHE, (void*) &size);
 
   can_enable_indexes= (file->s->state.key_map ==
                        set_bits(ulonglong, file->s->base.keys));