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


mysys/thr_mutex.c:
  Auto merged

 - Set the value of mp->thread before mp->count to avoid race condition.


mysys/thr_mutex.c:
  Set mp->thread before mp->count is changed. 
  Since mp->count is used in the macros 'safe_mutex_assert_not_owner' and 
  'safe_mutex_assert_owner' as an inidicator wheter to look at the mp->thread
  variable or not. This means that when mp->count is changed, the mp->thread
  should akready be set to the owning thread.
  Also set mp->thread to 0 when unlocking the mutex.

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


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

sql/mysql_priv.h:
  Removing isam option
sql/mysqld.cc:
  Removing isam option
sql/set_var.cc:
  Removing isam option.

into  zim.tangent.org:/home/brian/mysql/dep-5.1

This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 


BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
  Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  New results
mysql-test/r/ctype_ujis.result:
  New results
mysql-test/r/innodb_concurrent.result:
  New results.
mysql-test/r/rpl_heap.result:
  New results
mysql-test/r/warnings.result:
  New results
mysql-test/t/ctype_ujis.test:
  Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
  Fixed test for engine
mysql-test/t/rpl_heap.test:
  Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
  Fixed setup.
mysql-test/t/warnings.test:
  Removed deprecated tests
scripts/fill_func_tables.sh:
  Fixed script
scripts/mysql_convert_table_format.sh:
  Fixed script
sql/ha_innodb.cc:
  Fixed comment
sql/sql_yacc.yy:
  Removed deprecated syntax
tests/fork_big.pl:
  Fixed scipt
tests/fork_big2.pl:
  Fixed script
tests/mail_to_db.pl:
  Fixed script
tests/mysql_client_test.c:
  Fixed test

include/config-netware.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
netware/BUILD/compile-AUTOTOOLS:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/my_manage.h:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/BUILD/compile-linux-tools:
  Auto merged
netware/BUILD/compile-netware-END:
  Auto merged
netware/BUILD/mwenv:
  Auto merged
netware/BUILD/nwbootstrap:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/os/os0thread.c:
  Auto merged
storage/myisam/mi_locking.c:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged

  Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved


mysql-test/t/disabled.def:
  Reenabled tests 'innodb_concurrent', 'innodb_unsafe_binlog', 'rpl_ndb_log' as bugs 3300 15650 17081 are solved

VC++Files/libmysqld/libmysqld.vcproj:
  Auto merged

  Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
  Added "my_user.c"


VC++Files/libmysqld/libmysqld.vcproj:
  Added "my_user.c"
mysql-test/t/disabled.def:
  Disabled 'rpl_until' until 15886 is solved

mysql-test/t/log_tables.test:
  fix race condidtion

mysql-test/lib/mtr_cases.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged

mysql-test/lib/mtr_cases.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/spatial.cc:
  Auto merged

  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0


mysql-test/lib/mtr_process.pl:
  Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
  Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test/lib/mtr_report.pl:
  Parse error logs to create "warnings" file
sql/spatial.cc:
  Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"

into  zim.tangent.org:/home/brian/raid/mysql-5.1-new


sql/ha_myisam.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_yacc.yy:
  SCCS merged

This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 


sql/ha_myisam.cc:
  Remove RAID code
sql/ha_partition.cc:
  Remove RAID code.
sql/handler.h:
  Remove RAID code
sql/lex.h:
  Remove RAID code.
sql/mysqld.cc:
  Remove RAID code.
sql/set_var.cc:
  Remove RAID code.
sql/sql_show.cc:
  Remove RAID code
sql/sql_yacc.yy:
  Remove more of the RAID code
sql/table.cc:
  Remove RAID code.

into mysql.com:/Users/kent/mysql/bk/mysql-4.1


scripts/make_binary_distribution.sh:
  Auto merged

  print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script

into  mysql.com:/usr/local/mysql/mysql-5.0


mysql-test/lib/mtr_process.pl:
  Auto merged

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

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

  Give space for second and third slave port


mysql-test/mysql-test-run.pl:
  Give space for second and third slave port
  Define shell variables for all ports, and
  list these at startup
mysql-test/mysql-test-run.sh:
  Give space for second and third slave port

into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/lib/mtr_process.pl:
  Auto merged

mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.


mysql-test/lib/mtr_process.pl:
  Fix race (on some platforms) when killing processes.

into lmy004.:/work/mysql-5.1-new-clean

into lmy004.:/work/mysql-5.1-new-clean


tests/mysql_client_test.c:
  Auto merged

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

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg

After merge fix.

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

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


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

into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg


mysql-test/r/create_select_tmp.result:
  Auto merged
mysql-test/r/heap_hash.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/r/rpl_loaddata.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/sp_trans.result:
  Auto merged
mysql-test/r/type_bit.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
mysql-test/r/heap.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge
mysql-test/r/rpl_err_ignoredtable.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge
mysql-test/r/rpl_insert_id.result:
  WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
  Manual merge

  Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave


mysql-test/mysql-test-run.sh:
  Give port space for more than one slave
mysql-test/mysql-test-run.pl:
  Display instance manager port

mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
mysql-test/mysql-test-run.pl:
  Rearranged the port numbers to fit into the range

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

into  mysql.com:/home/cps/mysql/devel/5.1-merge


mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged