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/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 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

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  SCCS merged
sql/ha_ndbcluster.h:
  SCCS merged

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

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


sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_basic.result:
  manual merge
mysql-test/t/ndb_basic.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge

Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead


mysql-test/r/ndb_basic.result:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
mysql-test/t/ndb_basic.test:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
sql/ha_ndbcluster.cc:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
sql/ha_ndbcluster.h:
  Bug #17249 delete statement with join where clause fails when table do not have pk
  Bug #17257 update fails for inner joins if tables do not have Primary Key
  
  change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead

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


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

into  mysql.com:/home/cps/mysql/devel/5.0-mike

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

into  mysql.com:/home/cps/mysql/devel/5.0-mike

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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0