into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_union.cc:
  Auto merged

mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_select.cc:
  Auto merged

mysql-test/r/order_by.result:
  buggy results bug#3681
mysql-test/t/order_by.test:
  test for bug#3681

into mysql.com:/home/my/mysql-4.1


mysql-test/r/func_encrypt.result:
  Auto merged

mysql-test/r/func_encrypt.result:
  Update tests (left after sanjas last push)
mysql-test/r/innodb.result:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
mysql-test/t/innodb.test:
  Added test for bug #3749 (bug in deleting automatic generated foreign keys)
sql/sql_class.cc:
  Updated comment
tests/client_test.c:
  Added missing mysql_stmt_close()

mysql-test/r/func_encrypt.result:
  right SELECT print
mysql-test/r/func_gconcat.result:
  make results stable
mysql-test/t/func_gconcat.test:
  make results stable

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1

libmysqld/examples/Makefile.am:
  CXXLINK specified for client_test with libmysqld

mysql-test/r/func_gconcat.result:
  test of Bug #3752
mysql-test/t/func_gconcat.test:
  test of Bug #3752
sql/sql_base.cc:
  check of item name presence in find_item_in_list

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1

into hundin.mysql.fi:/home/marko/j/mysql-4.1

innobase/btr/btr0cur.c:
  Replace IB__FILE__ with __FILE__
innobase/btr/btr0sea.c:
  Replace IB__FILE__ with __FILE__
innobase/buf/buf0buf.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/ibuf/ibuf0ibuf.c:
  Replace IB__FILE__ with __FILE__
innobase/include/buf0buf.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/buf0buf.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/mem0mem.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mem0mem.ic:
  Add const qualifiers
innobase/include/mtr0mtr.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/mtr0mtr.ic:
  Add const qualifiers
innobase/include/pars0pars.h:
  Add const qualifiers
innobase/include/sync0arr.h:
  Add const qualifiers
innobase/include/sync0ipm.ic:
  Replace IB__FILE__ with __FILE__
innobase/include/sync0rw.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0rw.ic:
  Add const qualifiers
innobase/include/sync0sync.h:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/include/sync0sync.ic:
  Add const qualifiers
innobase/include/univ.i:
  Remove IB__FILE__
innobase/include/ut0dbg.h:
  Replace IB__FILE__ with __FILE__
innobase/lock/lock0lock.c:
  Replace IB__FILE__ with __FILE__
innobase/log/log0recv.c:
  Replace IB__FILE__ with __FILE__
innobase/mem/mem0mem.c:
  Add const qualifiers
innobase/pars/pars0pars.c:
  Add const qualifiers
innobase/sync/sync0arr.c:
  Add const qualifiers
innobase/sync/sync0rw.c:
  Replace IB__FILE__ with __FILE__
  Add const qualifiers
innobase/sync/sync0sync.c:
  Add const qualifiers
innobase/trx/trx0rec.c:
  Replace IB__FILE__ with __FILE__

into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1


mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

innobase/include/ut0mem.h:
  Add const qualifiers and remove unused function ut_str_catenate()
innobase/include/ut0mem.ic:
  Add const qualifiers
innobase/ut/ut0mem.c:
  Remove unused function ut_str_catenate()

innobase/os/os0file.c:
  Disable os_file_lock() on FreeBSD

mysql-test/r/innodb.result:
  tests for bug#3749
mysql-test/t/innodb.test:
  tests for bug#3749

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.

  Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.


sql/sql_table.cc:
  Fix bug #3749: if there were several indexs that made an automatically generated FOREIGN KEY index redundant, then MySQL miscalculated the number of keys, and the AUTO_INCREMENT flag was forgotten by MySQL from a PRIMARY KEY. There were probably a multitude of other errors caused by this.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mc05.(none):/space/tomas/mysql-4.1-ndb

into mc05.(none):/space/tomas/mysql-4.1-ndb

into deer.(none):/home/hf/work/mysql-4.1.ps

into mc05.(none):/space2/tomas/mysql-4.1

ndb/src/ndbapi/Ndberr.cpp:
  Rename: ndb/src/ndbapi/Ndberror.cpp -> ndb/src/ndbapi/Ndberr.cpp

into mc05.(none):/space/tomas/mysql-4.1-ndb


ndb/src/common/transporter/Makefile:
  Auto merged

into deer.(none):/home/hf/work/mysql-4.1.ps

something in embedded PS


BitKeeper/etc/ignore:
  Added libmysqld/examples/client_test.c to the ignore list
libmysqld/examples/Makefile.am:
  tests/client_test is now symlinked to libmysqld/examples catalog
  then it's built with libmysqld.a

into mc05.(none):/space/tomas/mysql-4.1-ndb

into build.mysql.com:/users/tulin/mysql-4.1

  fixed typo


ndb/bin/regression.sh:
  fixed typo