column types TIMESTAMP is NOT NULL by default, so in order to have 
TIMESTAMP column holding NULL valaues you have to specify NULL as
one of its attributes (this needed for backward compatibility).

Main changes:
Replaced TABLE::timestamp_default_now/on_update_now members with
TABLE::timestamp_auto_set_type flag which is used everywhere
for determining if we should auto-set value of TIMESTAMP field 
during this operation or not. We are also use Field_timestamp::set_time()
instead of handler::update_timestamp() in handlers.

if possible"
        - many new test cases
        - more and improved comments
      New files: t/ps_7ndb.test       test suite for NDB tables
                 r/ps_7ndb.result     expected results
                 include/ps_conv.inc  conversion test cases
+ review comments and fixes.

into MY_CHARSET_INFO structure.

into deer.(none):/home/hf/work/mysql-4.1.5532

  Logging to logging@openlogging.org accepted
sql_show.cc, type_enum.test, type_enum.result:
  Bug #5628 German characters in field-defs will be '?' with some table definitions

into mysql.com:/home/dlenev/src/mysql-4.1-memroot

into deer.(none):/home/hf/work/mysql-4.1.5371

we do not increment rli->group_master_log_pos if we are just after a SET ONE_SHOT (it's not a standalone event)

into deer.(none):/home/hf/work/mysql-4.1.5371

into mysql.com:/home/dlenev/src/mysql-4.1-memroot

with memory roots in THD/Statement/Item_arena.
Added assertions preventing memory allocation on bzero'ed MEM_ROOT since it is worked by 
pure luck and was very ineffective.

CREATE TABLE t1 SELECT POINT(1,2); fixed

prepared statements."

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

into private-client-ip-101.oz.net:/Users/brian/mysql/mysql-4.1

allow blank lines in Ndb.cfg files

   label for now)
 - tagged ChangeSet 1.2015.1.10 as "mysql-4.1.5"

OPTIMIZE TABLE <archive table>

This recompresses the table, thus removing any additional gzip headers caused by opening/closing or flushing the table.

into neptunus.(none):/home/magnus/mysql/mysql-4.1

into mysql.com:/GORDON/MySQL/mysql-4.1/src

These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible

They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.

Merge fixes

uninit variable

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

into neptunus.(none):/home/magnus/mysql/mysql-4.1

key Column Fails".

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

with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.

into hundin.mysql.fi:/home/marko/j/mysql-4.1

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