Merge with MySQL 5.1.55

- Fixed some issues with partitions and connection_string, which also fixed lp:716890 "Pre- and post-recovery crash in Aria"
- Fixed wrong assert in Aria

Now need to merge with latest xtradb before pushing 

sql/ha_partition.cc:
  Ensure that m_ordered_rec_buffer is not freed before close.
sql/mysqld.cc:
  Changed to use opt_stack_trace instead of opt_pstack.
  Removed references to pstack
sql/partition_element.h:
  Ensure that connect_string is initialized
storage/maria/ma_key_recover.c:
  Fixed wrong assert

1 files changed, 2 insertions, 5 deletions

diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql
index e3c230bfaca..30d30328e3d 100644
--- a/scripts/fill_help_tables.sql
+++ b/scripts/fill_help_tables.sql
@@ -1,4 +1,4 @@
--- Copyright (c) 2003, &year, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (C) 2005 MySQL AB
 -- 
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -11,9 +11,7 @@
 -- 
 -- You should have received a copy of the GNU General Public License
 -- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
--- DO NOT EDIT THIS FILE. It is generated automatically.
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 -- To use this file, load its contents into the mysql database. For example,
 -- with the mysql client program, process the file like this, where
@@ -2012,4 +2010,3 @@ insert into help_relation (help_topic_id,help_keyword_id) values (206,447);
 insert into help_relation (help_topic_id,help_keyword_id) values (464,447);
 insert into help_relation (help_topic_id,help_keyword_id) values (198,448);
 insert into help_relation (help_topic_id,help_keyword_id) values (464,449);
-