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

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

subselects into account

It is forbidden to use the SELECT INTO construction inside UNION statements
unless on the last SELECT of the union. The parser records whether it 
has seen INTO or not when parsing a UNION statement. But if the INTO was
legally used in an outer query, an error is thrown if UNION is seen in a
subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
mitigate the error unless it collides with the UNION.

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

fixes for SLES10

into  lapi.mysql.com:/home/tkatchaounov/mysql/src/5.1#32694

  
The problem was that when convert_constant_item is called for subqueries,
this happens when we already started executing the top-level query, and
the field argument of convert_constant_item pointed to a valid table row.
In turn convert_constant_item used the field buffer to compute the value
of its item argument. This copied the item's value into the field,
and made equalities with outer references always true.
  
The fix saves/restores the original field's value when it belongs to an
outer table.

into  moonbone.local:/work/32482-5.1-opt-mysql

The Item_func_set_user_var::register_field_in_read_map() did not check 
that the result_field was null.This caused server crashes for queries that
required order by such a field and were executed without using a temporary
table.

The Item_func_set_user_var::register_field_in_read_map() now checks the
result_field to be not null.

into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt

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

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

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

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

initialise limits properly for getopt_ll_limit()
(fixes falcon_opt test)

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

ha_partition::update_create_info() just calls update_create_info
of a first partition, so only get the autoincrement maximum
of the first partition, so SHOW CREATE TABLE can show
small AUTO_INCREMENT parameters.
Fixed by implementing ha_partition::update_create_info() in a way
other handlers work.
HA_ARCHIVE:stats.auto_increment handling made consistent with other engines

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

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

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

additional fixes for BDB and correct assignment of both signed
and unsigned 64-bit data to unsigned system variables

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

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

additional fixes for 64-bit
---
Merge mysql.com:/misc/mysql/31177/50-31177
into  mysql.com:/misc/mysql/31177/51-31177
---
Bug#31177: Server variables can't be set to their current values

additional 5.1 fixes (for plugins)

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.

additional fixes for 64-bit

extra 5.1 fixes

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

into  mysql.com:/misc/mysql/31177/50-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:/misc/mysql/32707/50-32707

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