string2decimal_fixed
  decimal_round(from, to)
  decimal_make_zero
  decimal_string_size
  decimal_neg

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  Link adaptive hash index entries to the buffer page, so that we can remove them quickly without knowing the record structure on that page; this was requested by Marko for the compact InnoDB table format; note that the adaptive hash index memory overhead grows by 67 %, maybe we have to tune this later somehow

  COND_EQUAL must be derived from Sql_alloc to simplify memory
  management for objects of this class.
  This fixes a leak in mysql-test-run noticed by PEM.
opt_range.cc:
  Fixed uninitialized min_max_range member the QUICK_GROUP_MIN_MAX_SELECT class.

  Fixed the pre-caching of functions. It now gives the expected stack overrun
  error for functions recursing too deep.

  ...and no ALTER privilege either.
  For now, only the definer and root can drop or alter an SP.

Removed the support for renaming SPs. It's non-standard, conflicted with a standard
syntax, and was a bit broken anyway.

  Typos in comments.

into gw.mysql.r18.ru:/usr/home/ram/work/5.0

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

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

  Post-merge fixes.
sql_select.cc:
  Post-merge cleanup.

check option build only according most top VIEW  CHECK OPTION TYPE  (BUG#5993)

  Remove compiler warning 'skip_auto_inc_decr' : unreferenced local variable in Visual C++; of course, I still have to check Monty's auto-inc patch in whole

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

  Fixed bug #6187: a wrong initial setting for const_item_cache
  in Item_cond::fix_fields.

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

  Post automerge correction.

  Added the code processing on expressions for applying
  multiple equalities.
sql_select.cc:
  Post-merge fixes for Item_equal patch.
  Added the code processing on expressions for applying
  multiple equalities.
Many files:
  Post-merge fixes for Item_equal patch.
item_cmpfunc.cc:
  Post-merge fixes for Item_equal patch.
  Fixed a problem when an equality field=const cannot be applied to
  the predicate P(field,c) for constant propagation as a conversion
  of field is needed.
item.h, item.cc:
  Fixed a problem when an equality field=const cannot be applied to
  the predicate P(field,c) for constant propagation as a conversion
  of field is needed.

test results corrected

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

  Change parsing of @image argument.