into  mysql.com:/home/kostja/mysql/mysql-5.0-merge

get_defaults_file() -> get_defaults_options()

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

into moonbone.local:/work/mysql-5.0-bug-11482

into moonbone.local:/work/mysql-5.0-bug-11482

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

  Changed test case comment to be more meaningful

  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 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.

Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (

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

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

into  krsna.patg.net:/home/patg/mysql-5.0

  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.

WHERE statement"

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

  Fixed bug #11885.
sql_select.cc:
  Fixed bug #11885.
  Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now
  is replaced by 'a=v' and 'a<>v' at the parsing stage.
sql_yacc.yy:
  Fixed bug #11885.
  Predicates of the forms 'a IN (v)' 'a NOT IN (v)' now 
  is replaced by 'a=v' and 'a<>v' at the parsing stage.

  Fixed bug #11853.
  Corrected the code of the range optimization for
  NOT IN and NOT BETWEEN.
range.test, range.result:
  Fixed bug #11853.

into  mysql.com:/media/sda1/mysql/mysql-5.0-merge

"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 lmy002.wdf.sap.corp:/home/georg/work/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0

Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)

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  zim.(none):/home/brian/mysql/foo-5.0

deallocation cleanup

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

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