Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue