Merge branch 'mysql-5.5' into mysql-5.6

Author: Arun Kuruvila

sql/sql_table.cc

@@ -6954,6 +6954,10 @@ mysql_prepare_alter_table(THD *thd, TABLE *table,
   if (create_info->storage_media == HA_SM_DEFAULT)
     create_info->storage_media= table->s->default_storage_media;
 
+  /* Creation of federated table with LIKE clause needs connection string */
+  if (!(used_fields & HA_CREATE_USED_CONNECTION))
+    create_info->connect_string= table->s->connect_string;
+
   restore_record(table, s->default_values);     // Empty record for DEFAULT
   Create_field *def;
 

storage/federated/ha_federated.cc

@@ -2901,7 +2901,7 @@ int ha_federated::info(uint flag)
 
   }
 
-  if (flag & HA_STATUS_AUTO)
+  if ((flag & HA_STATUS_AUTO) && mysql)
     stats.auto_increment_value= mysql->insert_id;
 
   mysql_free_result(result);