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

spaces at line end in fresh definitions removed
fixed printing of nested joins (BUG#4352)

into rurik.mysql.com:/home/igor/dev/mysql-5.0-1

  Post-merge fixes for nested joins.
  The join_tab_cmp function in sql_select has been changed.
join_nested.result:
  Post-merge fixes for nested joins. 
  The join_tab_cmp function in sql_select has been changed
sql_select.cc:
  Post-merge fixes for nested joins.
  Avoided re-execution of eliminate_not_funcs and simplify_joins
  in optimize_cond.
  Changed the join_tab_cmp function to take into account
  the dependent relation.
sql_lex.cc, sql_lex.h:
  Added the first_cond_optimization flag to st_select_lex to avoid
  re-execution of some optimizations in optimize_cond.
sql_base.cc:
  Post-merge fixes for nested joins. 
  Fixed problems with a proper column list substituted for '*' in
  queries with natural joins.

  Nested joins: review modifications.

If cost(full_scan_on_shortest_covering_index) < cost(best_range_scan) <  cost(full_table_scan)
  use full_scan_on_shortest_covering_index
(before this fix best_range_scan was used)

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-5.0

  fix up test result.

Also added some related security tests and corrected related error messages.

into mysql.com:/home/pem/work/mysql-5.0-merge

  Correction for nested joins.

  new file
Many files:
  Nested joins added.

into mysql.com:/home/pem/work/mysql-5.0-merge

It's not possible to quote the definition according to the current sql_mode
setting, so instead we use the setting stored with the SP (that's how it's
parsed anyway), and show this setting in the SHOW CREATE output.

This fixes part of BUG#3229: Stored procedure comment causes packets out of order.

into mysql.com:/home/wax/mysql/mysql-5.0service

into mysql.com:/home/pem/work/mysql-5.0-merge

Not finished, will not be pushed until additional fixes have been made.

Fixed an incorrect optimizer choice for ror-intersect(key, clustered_primary)
Typo bug fixed in multitable update

 * Fixed test results.

 * Fixed a problem with wrong query results for partially covering keys in ROR-index_merge
 * ROR-intersection retrieval plan choice algorithm now uses less disk IO
   - and properly processes clustered PK range scans 
 * Fixed several minor range optimizer problems
 * Added more comments
 * Code cleanup