into mysql.com:/home/mysql_src/mysql-4.1-1717

into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-clean

you just need to change this line of mysqld.cc:
#if MYSQL_VERSION_ID >= 40103
to, say,
#if MYSQL_VERSION_ID > 40103
I am noticing a failure of bdb.test; I believe this is not related to the
code I added yesterday and today, but I am checking. In any case I push this
changeset as it cannot by itself bring more mess that I *may* (or not)
already have brought with previous pushes.


sql/handler.cc:
  if innodb_active_trans is true then innobase_tid too.
sql/mysqld.cc:
  only a warning if --innodb-safe-binlog without InnoDB (it's true this situation will not hurt).
  Enabling the --innodb-safe-binlog option.

into mysql.com:/dbdata/psergey/mysql-4.1-root


sql/sql_yacc.yy:
  Auto merged

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198

into mysql.com:/home/jonas/src/mysql-4.1

(the previous commit was in "non" fresh clone :-()


ndb/src/kernel/SimBlockList.cpp:
  fixes for solaris build issues
ndb/src/ndbapi/Ndb.cpp:
  fixes for solaris build issues
ndb/src/ndbapi/Ndbinit.cpp:
  fixes for solaris build issues

into mysql.com:/home/mysql_src/mysql-4.1-1717

a limitation of yesterday's implementation:
if there was an unfinished transaction (COMMIT not typed), and some MyISAM tables were
then updated, and then mysqld crashes, then at restart the server would use the too old
binlog offset known by InnoDB to cut the binlog, thus cutting the successful MyISAM
updates. We fix this by reporting the binlog offset into InnoDB even if InnoDB was not
affected at all by the update.
But the feature is still disabled until we decide if it can go into 4.1.3.


sql/handler.cc:
  How we report the binlog offset into InnoDB:
  - if the update affected InnoDB, it will happen naturally
  - otherwise (for example MyISAM update not in an InnoDB transaction), we explicitely report it.
sql/handler.h:
  removing warning (noticed this)
sql/log.cc:
  clearer messages when truncating binlog.
sql/mysql_priv.h:
  need to see opt_innodb_safe_binlog in handler.cc
sql/mysqld.cc:
  No innodb-safe-binlog if no InnoDB.
  Updating message as now we work with MyISAM.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198


sql/sql_select.cc:
  Auto merged

scripts/make_binary_distribution.sh:
   - added mysql_tzinfo_to_sql to binary distribution
support-files/mysql.spec.sh:
   - added mysql_tzinfo_to_sql to the server subpackage
   - run "make clean" instead of "make distclean"

before being available to users. That will be the case in 4.1.4.
The "bk commit in mysqldoc" corresponding to this feature was not pushed.
Removing the 6 tests, they'll be pushed again later.


BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a.result~c9ecac961121bd4e:
  Delete: mysql-test/r/rpl_crash_binlog_ib_1a.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b.result~437e146cd203b120:
  Delete: mysql-test/r/rpl_crash_binlog_ib_1b.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a.result~9a8bcdcc9218e280:
  Delete: mysql-test/r/rpl_crash_binlog_ib_2a.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b.result~8d03dd3a2da8b228:
  Delete: mysql-test/r/rpl_crash_binlog_ib_2b.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a.result~81a4b08a5259aef1:
  Delete: mysql-test/r/rpl_crash_binlog_ib_3a.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b.result~ce5077d6b541e48c:
  Delete: mysql-test/r/rpl_crash_binlog_ib_3b.result
BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a-master.opt~f9cc9d326400bc96:
  Delete: mysql-test/t/rpl_crash_binlog_ib_1a-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_1a.test~ca1e5ae4b81c69ce:
  Delete: mysql-test/t/rpl_crash_binlog_ib_1a.test
BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b-master.opt~d8ad8b1c484b86c3:
  Delete: mysql-test/t/rpl_crash_binlog_ib_1b-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_1b.test~450096adbbe9214:
  Delete: mysql-test/t/rpl_crash_binlog_ib_1b.test
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a-master.opt~d8e2c519c1a8d580:
  Delete: mysql-test/t/rpl_crash_binlog_ib_2a-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2a.test~8a3a7646227ad59:
  Delete: mysql-test/t/rpl_crash_binlog_ib_2a.test
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b-master.opt~5cb4dc88644cac71:
  Delete: mysql-test/t/rpl_crash_binlog_ib_2b-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_2b.test~95e00750688e5950:
  Delete: mysql-test/t/rpl_crash_binlog_ib_2b.test
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a-master.opt~233787f10a34d70:
  Delete: mysql-test/t/rpl_crash_binlog_ib_3a-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3a.test~c3cf56608fa38ab2:
  Delete: mysql-test/t/rpl_crash_binlog_ib_3a.test
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b-master.opt~5a878d6ca9b620ba:
  Delete: mysql-test/t/rpl_crash_binlog_ib_3b-master.opt
BitKeeper/deleted/.del-rpl_crash_binlog_ib_3b.test~d283dc272a38175:
  Delete: mysql-test/t/rpl_crash_binlog_ib_3b.test
sql/mysqld.cc:
  disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too,
  before being available to users. That will be the case in 4.1.4.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix

client/mysqltest.c:
  'res' does not exist here

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix

into mysql.com:/home/mysql_src/mysql-4.1-1717


client/mysqltest.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

Final push. Printing some warnings at startup, as --innodb-safe-binlog requires
some other options, to work as expected.
Adding 6 new tests (3 pairs). If they fail on some platforms (so far they have been run only on my Linux),
they should be ignored for the 4.1.3 build (you can just
rm mysql-test/*/rpl_crash_*).
Now going to update doc.


mysql-test/misc/kill_master.sh:
  If the mysqld process has already gone away, 'kill' will fail, so we need to explicitely
  exit 0, so that the non-zero return code of kill does not make mysqltest stop.
sql/log.cc:
  VC++ does not know (ulonglong)(-1)
sql/mysqld.cc:
  When using --innodb-safe-binlog, some options need to automatically be turned on.

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix


sql/tztime.cc:
  Auto merged

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

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-winfix


sql/tztime.cc:
  Auto merged

sql/tztime.cc:
  Fixed compilation on Windows.
  Added casts to avoid warnings.
  2nd argument of hash_search should be of type const byte *.

into here.mwagner.org:/Volumes/BK/mysql-4.1

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


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged

mysql-test/r/bdb.result:
  bug#4000
mysql-test/t/bdb.test:
  bug#4000
sql/sql_select.cc:
  cleanup

  Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()


Build-tools/mysql-copyright:
  Fixed vim to expandtab's, retab'd code
  Fixed CWD bug in trim_the_fat()

  Fix typo.


client/mysqldump.c:
  Fix typo.

  Cleaned-up trim_the_fat()


Build-tools/mysql-copyright:
  Cleaned-up trim_the_fat()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Correct the help text for mysqldump --set-charset option.


client/mysqldump.c:
  Correct the help text for mysqldump --set-charset option.

   weird compile errors)


Build-tools/Do-compile:
   - using "--with-libedit" is sufficient

into mysql.com:/usr/home/bar/mysql-4.1

  --with-charset=binary didn't really work after my previous change.


configure.in:
  --with-charset=binary didn't really work after my previous change.

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

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


sql/ha_myisam.cc:
  Auto merged

into mysql.com:/usr/home/bar/mysql-4.1