into  trift2.:/MySQL/M51/push-5.1


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

    Fix the move of "mysqlmanager" to section 8: Directory name was wrong.


support-files/mysql.spec.sh:
  Fix the move of "mysqlmanager" to section 8: Directory name was wrong.

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/spec-5.1


support-files/mysql.spec.sh:
  SCCS merged

    The "mysqlmanager" man page got moved from section 1 to 8.


support-files/mysql.spec.sh:
  The "mysqlmanager" man page got moved from section 1 to 8.

into  trift2.:/MySQL/M50/spec-5.0


support-files/mysql.spec.sh:
  Manual merge.

    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".


support-files/mysql.spec.sh:
  The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_class.h:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged

mysql-test/Makefile.am:
  BUG#24902

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/sql_class.h:
  Auto merged

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

mysql-test/lib/mtr_unique.pl:
  do not autorelease build ids when a child dies

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


scripts/Makefile.am:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


scripts/Makefile.am:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged

scripts/Makefile.am:
  pass --sysconfdir to scripts
scripts/mysqlaccess.sh:
  use --sysconfdir instead of hardcoded /etc
scripts/mysqld_multi.sh:
  use --sysconfdir instead of hardcoded /etc

into  example.com:/work/mysql-5.1-maint

mysql-test/t/events_bugs.test:
  let events_bugs not fail because of timing
sql/sql_table.cc:
  if the db or name has been changed ALTER_RENAME,
  then fix table_list
  Solution by having the second table added in the parser to the
  list of used tables, won't work because checking of rights of merge
  tables goes over table_list->next_local and checks the rights, so
  we will fail there.
sql/sql_yacc.yy:
  fix name - prevents ddd from correct working

into  mysql.com:/home/hf/work/pfix/my51-pfix


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged

mysql-test/r/gis.result:
  result fixed
mysql-test/t/gis.test:
  path to datafile fixed

into  mysql.com:/home/hf/work/22372/my51-22372


mysql-test/t/gis.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/gis.result:
  SCCS merged
sql/field.h:
  merging

mysql-test/r/gis.result:
  result fixed
sql/field.cc:
  Field_*::reset() now returns int
sql/sql_load.cc:
  merging fix

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge

Remove DBUG_ENTER in my_end


client/mysqltest.c:
  Call 'mysql_server_end' as last function in 'free_used_memory'
  Don't use DBUG_VOID_RETURN after mysql_server_end in free_used_memory
  Only call mysql_server_end if mysql_server_init has been called

into  mysql.com:/home/hf/work/22372/my50-22372


mysql-test/r/gis.result:
  merging
mysql-test/t/gis.test:
  merging
sql/field.cc:
  merging
sql/field.h:
  merging
sql/sql_load.cc:
  merging

datafile added to be used in gis.test


mysql-test/std_data/bad_gis_data.dat:
  New BitKeeper file ``mysql-test/std_data/bad_gis_data.dat''

The problem is that the GEOMETRY NOT NULL can't automatically set
any value as a default one. We always tried to complete LOAD DATA
command even if there's not enough data in file. That doesn't work
for GEOMETRY NOT NULL. Now Field_*::reset() returns an error sign
and it's checked in mysql_load()


mysql-test/r/gis.result:
  test result
mysql-test/t/gis.test:
  testcase
sql/field.cc:
  reset() now returns error sign
sql/field.h:
  Field_*::reset() now returns error sign if the field can't be reset
sql/sql_load.cc:
  check if field can't be reset and return error if it's so

into  mysql.com:/home/hf/work/mysql-5.1.20835

uninitialized list of guarded instances.


server-tools/instance-manager/guardian.cc:
  Initialize guarded_instance to NULL in constuctor. Avoid looping over
  uninitialized list of guarded instances