into  five.local.lan:/work/merge/mysql-5.1-funcs_1


mysql-test/suite/funcs_1/cursors/cursors_master.test:
  Auto merged
BitKeeper/deleted/.del-innodb_triggers.result:
  Auto merged
BitKeeper/deleted/.del-memory_triggers.result:
  Auto merged
BitKeeper/deleted/.del-myisam_triggers.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
  Auto merged
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  SCCS merged
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
  SCCS merged
mysql-test/suite/funcs_1/t/innodb_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/memory_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/t/myisam_storedproc.test:
  Auto merged
mysql-test/suite/funcs_1/views/views_master.inc:
  Auto merged
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
  manual merge
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
  manual merge
mysql-test/suite/funcs_1/r/myisam_views.result:
  manual merge