into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-5.0-engines


sql/lock.cc:
  Use local.
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/sql_update.cc:
  Manual merge.

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines


sql/sql_update.cc:
  Auto merged

An update that used a join of a table to itself and modified the
table on one side of the join reported the table as crashed or
updated wrong rows.

Fixed by creating temporary table for self-joined multi update statement.


mysql-test/r/myisam.result:
  A test case for BUG#21310.
mysql-test/t/myisam.test:
  A test case for BUG#21310.
sql/lock.cc:
  Exclude 'table' param from check.
sql/sql_update.cc:
  Disabling record cache for self-joined multi update statement is wrong.
  The join must only see the table as it was at the beginning of the statement.
  safe_update_on_fly check if it is safe to update first table on the fly, that is
  not creating temporary table. It is possible in case a row from this table is
  never read more than once. safe_update_on_fly now detect self-joined table and
  refuse to update this table on the fly.

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg


configure.in:
  Auto merged
sql/sql_class.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  trift2.:/MySQL/M41/push-4.1

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

    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-4.1-build

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

into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-5.0-engines


mysql-test/r/alter_table.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
sql/sql_parse.cc:
  SCCS merged

into  mysql.com:/home/svoj/devel/mysql/BUG23404/mysql-4.1-engines


mysql-test/r/alter_table.result:
  SCCS merged
mysql-test/t/alter_table.test:
  SCCS 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-4.1-build

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


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

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/sql_class.h:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

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

            table

ROW_FORMAT option is lost during CREATE/DROP INDEX.

This fix forces CREATE/DROP INDEX to retain ROW_FORMAT by instructing
mysql_alter_table() that ROW_FORMAT is not used during creating/dropping
indexes.


mysql-test/r/alter_table.result:
  A test case for bug#23404.
mysql-test/t/alter_table.test:
  A test case for bug#23404.
sql/sql_parse.cc:
  CREATE/DROP INDEX must not change ROW_FORMAT. Setting create_info.row_type
  to ROW_TYPE_NOT_USED informs mysql_alter_table that ROW_FORMAT was not
  used during alteration, and thus must be retained.

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

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

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

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  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

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