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, 6 insertions, 4 deletions

diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index 7f2b6fc137f..b132631d414 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -131,8 +131,7 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
       mysql_port = MYSQL_PORT;
 #ifndef MSDOS
       {
-	struct servent *serv_ptr;
-	char	*env;
+	char *env;
 
         /*
           if builder specifically requested a default port, use that
@@ -145,8 +144,11 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)),
         */
 
 #if MYSQL_PORT_DEFAULT == 0
-        if ((serv_ptr = getservbyname("mysql", "tcp")))
-          mysql_port = (uint) ntohs((ushort) serv_ptr->s_port);
+        {
+          struct servent *serv_ptr;
+          if ((serv_ptr = getservbyname("mysql", "tcp")))
+            mysql_port = (uint) ntohs((ushort) serv_ptr->s_port);
+        }
 #endif
         if ((env = getenv("MYSQL_TCP_PORT")))
           mysql_port =(uint) atoi(env);