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

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2

functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1

Changes to Netware specific mysqld_safe.c

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

into  mysql.com:/usr/home/bar/mysql-5.0

  after-merge fix for
  bug#15581 COALESCE function truncates mutli-byte TINYTEXT values

  After merge fix:
  fixing order of results.

into mysql.com:/home/psergey/mysql-5.0-bug16166-r2

account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)

into  mysql.com:/usr/home/bar/mysql-5.0

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

into  mysql.com:/home/alik/MySQL/devel/5.0-bug15103

into  linux.site:/home/reggie/work/mysql-5.0

Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.

Modified rules: 
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()

functions are involved.

When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions 
to calculate their values correctly. Normally this null_row flag is cleared for 
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are 
always evaluated as nulls and whole select produces wrong result.

flush_cached_records() now clears null_row flag at the very beginning.

select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.

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

rename sha1_* to mysql_sha1_*

into  mysql.com:/usr/local/mysql/tmpbuild

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.

into  mysql.com:/usr/local/mysql/mysql-5.0