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/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

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

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

client library only sets mysql->insert_id when query returned
no recordset. So the embedded library should behave the same way

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.