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


sql/sql_class.h:
  Auto merged

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


configure.in:
  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  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  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

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

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

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

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_update.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Manual merge
storage/ndb/src/common/util/InputStream.cpp:
  Manual merge

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


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

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


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

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


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/parser.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_gis.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/parser.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

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

client/mysqltest.c:
  Exclude

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


sql/sql_class.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/sql_class.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836


sql/sql_class.cc:
  Auto merged

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836


sql/sql_class.cc:
  manual merge

- Comment Cleanup.


sql/sql_class.cc:
  Removed misleading comment.

error message in the logs before shutting down the server

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

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


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

mysql-test/r/sp.result:
  offset error number according to changed error messages file
mysql-test/r/sp_gis.result:
  offset error number according to changed error messages file

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


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

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


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

mysql-test/mysql-test-run.pl:
  delete $default_vardir if the 4.1 vardir trick is to be used to re-enable more than one test run in sequence

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  example.com:/work/bug22369-v2/my51