into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1

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

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

into  mishka.local:/home/my/mysql-4.1

  BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message

+ added switch --print-full-config
+ removed unused REP configuration

  BUG#11999, incorrect --help on perror with ndb

into  linux.site:/home/reggie/bk/bug7142

into production.mysql.com:/nfstmp1/guilhem/mysql-4.1-prod

 LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
are very small. Feel free to ask me if you have problems merging them.

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

  Added a test case for bug #11745.
sql_select.cc:
  Fixed bug # 11745.
  Added support of where clause for queries with FROM DUAL.
sql_yacc.yy:
  Fixed bug # 11745.
  Added optional where clause for queries with FROM DUAL.

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

"Negative integer keys incorrectly substituted for 0 during range analysis."

The problem is that the range optimizer incorrectly replaces any negative
constant with '0' for all types except BIGINT because the method save_in_field()
casts negative integers to non-negative. This causes incorrect query
results where (0 = any_negative_number).

The problem caused by this bug is fixed by the patch for BUG#11185.
That patch constitutes an optimization due to which the problem code is
never called with negative constants. This patch adds a test so we are sure
that the problem does not reappear.

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

into moonbone.local:/work/mysql-4.1-bug-11868

disabled if ref is built with a key from the updated table

Problem was in add_not_null_conds() optimization function.
It contains following code:
JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
...
add_cond_and_fix(&referred_tab->select_cond, notnull);
For UPDATE described in bug report referred_tab is 0 and dereferencing it
crashes the server.

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

into  mysql.com:/opt/local/work/mysql-4.1-root

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

into  linux.site:/home/reggie/bk/bug7403

 of system vars at PREPARE time": implement a special Item
to handle system variables. This item substitutes itself with 
a basic constant containing variable value at fix_fields.

  than in previous 4.1.x

Wrongly applied optimization were adding NOT NULL constraint which results in
rejecting valid rows and reduced result set.

The problem was that add_notnull_conds() while checking subquery were adding
NOT NULL constraint to left joined table, to which, normally, optimization 
don't have to be applied.

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

into  linux.site:/home/reggie/bk/bug7403

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

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

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

      + added close of some fd's
      + debug prints

In 4.1 the connection to the management server _must_ stay, that is how we
ensure that the nodeids are reserved correctly