into  stella.local:/home2/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_not_windows.result:
  Auto merged
mysql-test/r/partition_symlink.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/suite/parts/inc/partition_basic.inc:
  Auto merged
mysql-test/suite/parts/r/partition_basic_innodb.result:
  Auto merged
mysql-test/suite/parts/r/partition_basic_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/partition_info.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/rpl_rli.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/t/partition_symlink.test:
  Manual merge