Initially my_time.c was added to sql/ link_sources target only.
As it turns out this target is sometimes not called; instead of it
make calls one hard-coded in top-level Makefile.am.
Now adding linking of my_time.c to the top-level Makefile.am
to (hopefully) cover all cases.


Makefile.am:
  Fix of broken 4.1 tree: 
  - my_time.c was added to link_sources target.

into mysql.com:/home/kostja/mysql/mysql-4.1-root

into mysql.com:/space/my/mysql-4.1-build


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged

   build thread

   project file


VC++Files/sql/mysqld.dsp:
   - added missing file tztime.cpp to the mysqld project file

result of SHOW TABLE STATUS


BitKeeper/etc/ignore:
  added libmysqld/my_time.c

into mysql.com:/space/my/mysql-4.1-build

into mysql.com:/home/kostja/mysql/mysql-4.1-4030


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/tztime.cc:
  Auto merged

work (prepared statements)" and after-review fixes:
- str_to_TIME renamed to str_to_datetime to pair with str_to_time
- functions str_to_time and str_to_TIME moved to sql-common
- send_data_str now supports MYSQL_TYPE_TIME, MYSQL_TIME_DATE,
  MYSQL_TIME_DATETIME types of user input buffers.
- few more comments in the client library
- a test case added.


VC++Files/libmysql/libmysql.dsp:
  new file: my_time.c
VC++Files/libmysqld/libmysqld.dsp:
  new file: my_time.c
VC++Files/sql/mysqld.dsp:
  new file: my_time.c
include/Makefile.am:
  - mysql_time.h added to the list of installed client library headers
include/mysql.h:
  - declarations for MYSQL_TIME and enum_mysql_timestamp_type moved to 
  mysql_time.h, which is in shared use of client library and mysys.
libmysql/Makefile.shared:
  - my_time.lo added to the list of libmysql objects
libmysql/libmysql.c:
  Fix for bug#4030 "Client side conversion string -> date type doesn't work
   (prepared statements)" and cleanup.
  - added case labels for TIME/DATE/DATETIME types to send_data_str
  - comments for read_binary_{date,time,datetime}, fetch_result_*, fetch_results.
libmysqld/Makefile.am:
  - my_time.c added
sql-common/Makefile.am:
  - my_time.c added to the list of files included into source distribution.
sql/Makefile.am:
  my_time.c added to the list of mysqld sources.
sql/field.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/item_timefunc.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/mysql_priv.h:
  - added typedefs for TIME and timestamp_type
  - removed declarations for str_to_time and str_to_TIME (now this functions
    reside in mysys)
sql/mysqld.cc:
  - log_10_int moved to mysys (it's used by str_to_TIME and str_to_time)
  - enum values TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
    MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
sql/set_var.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
sql/set_var.h:
  - fixed timestamp_type usage to be compatible with typedef.
sql/sql_prepare.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME} were renamed to
    MYSQL_TIMESTAMP_{TIME,DATE,DATETIME}
  - embedded library implementation of set_param_{time,date,datetime} is
  much simplier now, as MYSQL_TIME is the same as TIME.
sql/sql_yacc.yy:
  - s/\<TIMESTAMP_/MYSQL_TIMESTAMP/gc
sql/structs.h:
  - declarations for TIME and timestamp_type replaced with typedefs
  - str_to_datetime arguments moved to mysys headers
sql/time.cc:
  - str_to_time and str_to_TIME moved to mysys
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...} as these names are now
    exported to client.
  - str_to_TIME renamed to str_to_datetime to pair with str_to_time
  - str_to_TIME_with_warn renamed accordingly
sql/tztime.cc:
  - TIMESTAMP_{TIME,DATE,DATETIME,...} renamed to 
    MYSQL_TIMESTAMP_{TIME,DATETIME,DATE,...}
tests/client_test.c:
  - a test case for Bug#4030 "Client side conversion string -> date type 
  doesn't work (prepared statements)"

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


sql/table.cc:
  Auto merged

into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1


sql/handler.cc:
  Auto merged

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

   file and sql/tztime.cpp to the libmysqld project file


VC++Files/innobase/innobase.dsp:
   - added missing file srv/srv0que.c to the project file
VC++Files/libmysqld/libmysqld.dsp:
   - added missing file sql/tztime.cpp to the project file

(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