into  dl145s.mysql.com:/data0/mhansson/my51-bug30234

Restores files that were automerged during null merge.

into  linux-st28.site:/home/martin/mysql/src/bug30234/my51-bug30234

Anti-patch. This patch undoes the previously pushed patch. It is 
null-merged in versions 5.1 and above since there the original 
patch is still desired.

extra 5.1 fixes

into  mysql.com:/misc/mysql/31177/51-31177

5.1+ specific fixes (plugins etc.)

into  mysql.com:/misc/mysql/31177/51-31177

into  mysql.com:/misc/mysql/32707/51-32707

into  mysql.com:/home/hf/work/mrg/my51-mrg

into  mysql.com:/misc/mysql/32180/51-32180

into  mysql.com:/home/hf/work/mrg/my51-mrg

into  mysql.com:/home/hf/work/mrg/my50-mrg

into  mysql.com:/home/hf/work/mrg/my50-mrg

into  mysql.com:/home/hf/work/mrg/my50-mrg

into  mysql.com:/home/hf/work/mrg/my51-mrg

into  mysql.com:/home/hf/work/mrg/my51-mrg

PS-protocol data is stored in different format - the MYSQL_RECORDS->data
contains the link to the record content, not to array of the links to
the field's contents. So we have to handle it separately for
embedded-server query cache.

into  mysql.com:/home/hf/work/mrg/my41-mrg

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/bug9481/my51-bug9481

removed unnecessary privilege checks for I_S schema

filesort() uses file->estimate_rows_upper_bound() call to allocate
internal buffers. If this function returns a value smaller than
a number of row that will be returned later in find_all_keys(),
that can cause server crash.
Fixed by implementing ha_federated::estimate_rows_upper_bound() to
return maximum possible number of rows.
Present estimation for FEDERATED always returns 0 if the linked to the VIEW.

into  mysql.com:/misc/mysql/32707/51-32707

into  mysql.com:/misc/mysql/32707/50-32707

Default values of variables were not subject to upper/lower bounds
and step, while setting variables was. Bounds and step are also
applied to defaults now; defaults are corrected quietly, values
given by the user are corrected, and a correction-warning is thrown
as needed. Lastly, very large values could wrap around, starting
from 0 again. They are bounded at the maximum value for the
respective data-type now if no lower maximum is specified in the
variable's definition.

Denormalized DOUBLE-s can't be properly handled by old MIPS processors.
So we need to enable specific mode for them so IRIX will do use
software round to handle such numbers. 

server status wasn't properly sent to the client after the error
by the embedded server. Wasn't noticed before as one usually stopped
retrieving results after he gets an error.

into  mysql.com:/home/psergey/mysql-5.1-bug32772

added new func mysql_create_like_schema_frm() which creates frm file based on I_S table

The bug was that for ordered index scans, ha_partition::index_init() did
not put index columns into table->read_set if the underlying storage 
engine did not have HA_PARTIAL_COLUMN_READ flag. 
This was causing assertion failure when handle_ordered_index_scan() tried
to sort the records according to index order.

Fixed by making ha_partition::index_init() put index columns into table->read_set
for all ordered scans. 

Miscalculation in protocol-layer: size buffer correctly so
even really long error messages cannot overflow our buffer.

into  magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt

There's currently no way of knowing the determinicity of an UDF.
And the optimizer and the sequence() UDFs were making wrong
assumptions about what the is_const member means.
Plus there was no implementation of update_system_tables()
causing the optimizer to overwrite the information returned by
the <udf>_init function.

Fixed by equating the assumptions about the semantics of 
is_const and providing a implementation of update_used_tables().
Added a TODO item for the UDF API change needed to make a better 
implementation.

  Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.

into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt

into  polly.(none):/home/kaa/src/opt/bug28837/my51-bug29131

self-join

When doing DELETE with self-join on a MyISAM or MERGE table, it could
happen that a record being retrieved in join_read_next_same() has
already been deleted by previous iterations. That caused the engine's
index_next_same() method to fail with HA_ERR_RECORD_DELETED error and
the whole DELETE query to be aborted with an error.

Fixed by suppressing the HA_ERR_RECORD_DELETED error in
hy_myisam::index_next_same() and ha_myisammrg::index_next_same(). Since
HA_ERR_RECORD_DELETED can only be returned by MyISAM, there is no point
in filtering this error in the SQL layer.

insert ... select.

The 5.0 manual page for mysql_insert_id() does not mention anything
about INSERT ... SELECT, though its current behavior is incosistent
with what the manual says about the plain INSERT.

Fixed by changing the AUTO_INCREMENT and mysql_insert_id() handling
logic in INSERT ... SELECT to be consistent with the INSERT behavior,
the manual, and the changes in 5.1 introduced by WL3146:


- mysql_insert_id() now returns the first automatically generated
AUTO_INCREMENT value that was successfully inserted by INSERT ... SELECT

-  if an INSERT ... SELECT statement is executed, and no automatically
generated value is successfully inserted, mysql_insert_id() now returns
the ID of the last inserted row.