into lmy004.:/work/mysql-5.1-bug16406


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

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

mysql-test/extra/rpl_tests/rpl_row_blob.test:
  enable rpl_ndb_blob2 (sleep fixed)
mysql-test/t/disabled.def:
  enable rpl_ndb_blob2 (sleep fixed)

sql/ha_ndbcluster_binlog.cc:
  optim: setting db/schema for data events seems unnecessary
storage/ndb/src/ndbapi/Ndb.cpp:
  use NAME_LEN

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

mysql-test/t/disabled.def:
  e
  hate bk

into  mysql.com:/space/pekka/ndb/version/my51


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

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

- test tables use blobs without PK, and was not handled correctly

storage/ndb/src/ndbapi/NdbBlob.cpp:
  DBUG
storage/ndb/include/ndbapi/Ndb.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  method to set db/schema from table name + format check in internalize_table_name
storage/ndb/src/ndbapi/Ndb.cpp:
  method to set db/schema from table name + format check in internalize_table_name
sql/ha_ndbcluster_binlog.cc:
  set injector_ndb db/schema before calling NDB (may be more cases..).  only place to get it is table internal name

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


mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Manual merge.

fails with --vardir option.

  Fix online ordered index build of varsize table


storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Fix online ordered index build of varsize table

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


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

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

  Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'


support-files/mysql.spec.sh:
  Reintroduced a max build
  Limited testing of 'debug' and 'max' servers
  Berkeley DB only in 'max'

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

  Added --restart-cleanup option
drop-on-restart.inc:
  DROP commands to cleanup on restart
  new file
mysqltest.c:
  Added option --include=<sql-file>


client/mysqltest.c:
  Added option --include=<sql-file>
mysql-test/include/drop-on-restart.inc:
  DROP commands to cleanup on restart
mysql-test/mysql-test-run.pl:
  Added --restart-cleanup option

client/Makefile.am:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
client/mysqlimport.c:
  SCCS merged

We had a number of tests where there were no bugs related to disabling of tests, bugs were fixed, or no clear discription or plan.


mysql-test/t/disabled.def:
  Re-enabling tests.

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

Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well). 


client/Makefile.am:
  Added threaded libary.
client/mysqlimport.c:
  Updated logic to use threaded libmysql correctly.
client/mysqlslap.c:
  Modified how threads were working.
mysql-test/r/backup.result:
  Added deprecated messages.
sql/sql_yacc.yy:
  Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER

into  mysql.com:/space/pekka/ndb/version/my51

"mysqldump" test fails (mysqlimport related, Brian aware), ndb_cache2 ndb_cache_multi2
partition_mgm_err fail (unrelated to my changes), rpl_row_view01 (known crash BUG#17265)


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  compared with 5.0, this part has to move to the wrappers as the arg of --start-position depends on row-based or statement-based replication
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  result update
mysql-test/r/rpl_row_UUID.result:
  result update (somebody had forgotten to run row-based tests, the solution is to use "make test" :)
mysql-test/t/binlog_row_mix_innodb_myisam.test:
  merge from 5.0
mysql-test/t/binlog_stm_mix_innodb_myisam.test:
  merge form 5.0
sql/mysqld.cc:
  fix after merge
sql/sp_head.cc:
  fix after merge

into  mysql.com:/home/mysql_src/mysql-5.1-new


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged

mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/t/mix_innodb_myisam_binlog.test:
  cleanup in the end

into  mysql.com:/home/mysql_src/mysql-5.1-new; will fix manually sp_head.cc and mysqld.cc later soon.


mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sql_mode.result:
  Auto merged
mysql-test/t/rpl_sp-slave.opt:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sql_mode.test:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/log.cc:
  auto merged
sql/mysqld.cc:
  will fix manually
sql/sp_head.cc:
  will fix manually

Fix for BUG#13897 "failure to do SET SQL_MODE=N where N is a number > 31" (the original bug's title isn't the simplest
symptom). sys_var::check_set() was wrong. mysqlbinlog makes use of such SET SQL_MODE=N
(where N is interpreted like if SQL_MODE was a field of type SET), so
this bug affected recovery from binlogs if the server was running with certain SQL_MODE values,
for example the default values on Windows (STRICT_TRANS_TABLES); to work around this bug people
had to edit mysqlbinlog's output.


mysql-test/r/sql_mode.result:
  result update
mysql-test/t/sql_mode.test:
  test for various numeric SQL_MODE values
sql/set_var.cc:
  For a set, it does not make sense to test if the supplied argument exceeds the number of elements in the set
  (such test would make sense for an enum), but rather to check if it exceeds 2^this (to verify
  that only reasonable bits are set).

if the function, invoked in a non-binlogged caller (e.g. SELECT, DO), failed half-way on the master,
slave would stop and complain that error code between him and master mismatch. 
To solve this, when a stored function is invoked in a non-binlogged caller (e.g. SELECT, DO), we binlog the function
call as SELECT instead of as DO (see revision comment of sp_head.cc for more).
And: minor wording change in the help text.
This cset will cause conflicts in 5.1, I'll merge.


mysql-test/r/rpl_sp.result:
  result update
mysql-test/t/rpl_sp-slave.opt:
  bug just fixed so option not needed
mysql-test/t/rpl_sp.test:
  test for more half-failed functions with DO and SELECT, to test the bug of this changeset.
  cleanup at the end.
sql/mysqld.cc:
  function -> stored function (change suggested by Paul)
sql/sp_head.cc:
  When a function updates data and is called from a non-binlogged statement (SELECT, DO), we binlog it 
  as SELECT myfunc(), and not DO myfunc() like before.

Fix for BUG#16559 "Replication Problems with Non transactional tables inside an interrupted trans.":
problem was: when a connection disconnects having an open transaction affecting MyISAM and InnoDB, the ROLLBACK event stored in the binary log
contained a non-zero error code (1053 because of the disconnection), so when slave applied the transaction, slave complained that its ROLLBACK succeeded
(error_code=0) while master's had 1053, so slave stopped. But internally generated binlog events such as this ROLLBACK
should always have 0 as error code, as is true in 4.1 and was accidentally broken in 5.0,
so that there is no false alarm.


mysql-test/r/mix_innodb_myisam_binlog.result:
  result update
mysql-test/t/mix_innodb_myisam_binlog.test:
  test for BUG#16559
sql/log.cc:
  Internally generated binlog events should always have an error code of zero (like in 4.1; in 5.0 this was accidentally broken).

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

into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug


mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged

  Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets


scripts/make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug/dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
VC++Files/client/mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
VC++Files/dbug/dbug.vcproj:
  Changed __WIN32__ to __WIN__
VC++Files/libmysql/libmysql.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
client/mysqlimport.c:
  Handle case where there is no snprintf()

into  mysql.com:/space/pekka/ndb/version/my51


mysql-test/t/disabled.def:
  Auto merged

  Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory


scripts/make_win_src_distribution.sh:
  Added copying of the include/mysql directory
client/Makefile.am:
  Add redundant CLIENT_THREAD_LIBS to LDADD, to make -lpthread go before
  -lc, required for the static linking with glibc 2.2.5 to work.