1 files changed, 24 insertions, 24 deletions

diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc
index b4b781ca534..f22bb6cb758 100644
--- a/storage/federated/ha_federated.cc
+++ b/storage/federated/ha_federated.cc
@@ -419,7 +419,7 @@ static int federated_rollback(handlerton *hton, THD *thd, bool all);
 
 /* Federated storage engine handlerton */
 
-static handler *federated_create_handler(handlerton *hton, 
+static handler *federated_create_handler(handlerton *hton,
                                          TABLE_SHARE *table,
                                          MEM_ROOT *mem_root)
 {
@@ -753,9 +753,9 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
       share->table_name++;
       share->table_name_length= (uint) strlen(share->table_name);
 
-      DBUG_PRINT("info", 
+      DBUG_PRINT("info",
                  ("internal format, parsed table_name share->connection_string \
-                  %s share->table_name %s", 
+                  %s share->table_name %s",
                   share->connection_string, share->table_name));
 
       /*
@@ -777,9 +777,9 @@ static int parse_url(MEM_ROOT *mem_root, FEDERATED_SHARE *share, TABLE *table,
       */
       share->table_name= strmake_root(mem_root, table->s->table_name.str,
                                       (share->table_name_length= table->s->table_name.length));
-      DBUG_PRINT("info", 
+      DBUG_PRINT("info",
                  ("internal format, default table_name share->connection_string \
-                  %s share->table_name %s", 
+                  %s share->table_name %s",
                   share->connection_string, share->table_name));
     }
 
@@ -971,8 +971,8 @@ uint ha_federated::convert_row_to_internal_format(uchar *record,
 static bool emit_key_part_name(String *to, KEY_PART_INFO *part)
 {
   DBUG_ENTER("emit_key_part_name");
-  if (append_ident(to, part->field->field_name, 
-                   strlen(part->field->field_name), ident_quote_char))
+  if (append_ident(to, part->field->field_name.str,
+                   part->field->field_name.length, ident_quote_char))
     DBUG_RETURN(1);                           // Out of memory
   DBUG_RETURN(0);
 }
@@ -1234,7 +1234,7 @@ read_range_first: start_key 3 end_key 3
 
 Summary:
 
-* If the start key flag is 0 the max key flag shouldn't even be set, 
+* If the start key flag is 0 the max key flag shouldn't even be set,
   and if it is, the query produced would be invalid.
 * Multipart keys, even if containing some or all numeric columns,
   are treated the same as non-numeric keys
@@ -1533,8 +1533,8 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
     query.append(STRING_WITH_LEN("SELECT "));
     for (field= table->field; *field; field++)
     {
-      append_ident(&query, (*field)->field_name, 
-                   strlen((*field)->field_name), ident_quote_char);
+      append_ident(&query, (*field)->field_name.str,
+                   (*field)->field_name.length, ident_quote_char);
       query.append(STRING_WITH_LEN(", "));
     }
     /* chops off trailing comma */
@@ -1542,7 +1542,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table)
 
     query.append(STRING_WITH_LEN(" FROM "));
 
-    append_ident(&query, tmp_share.table_name, 
+    append_ident(&query, tmp_share.table_name,
                  tmp_share.table_name_length, ident_quote_char);
 
     if (!(share= (FEDERATED_SHARE *) memdup_root(&mem_root, (char*)&tmp_share, sizeof(*share))) ||
@@ -1762,7 +1762,7 @@ bool ha_federated::append_stmt_insert(String *query)
     insert_string.append(STRING_WITH_LEN("INSERT IGNORE INTO "));
   else
     insert_string.append(STRING_WITH_LEN("INSERT INTO "));
-  append_ident(&insert_string, share->table_name, share->table_name_length, 
+  append_ident(&insert_string, share->table_name, share->table_name_length,
                ident_quote_char);
   tmp_length= insert_string.length();
   insert_string.append(STRING_WITH_LEN(" ("));
@@ -1776,8 +1776,8 @@ bool ha_federated::append_stmt_insert(String *query)
     if (bitmap_is_set(table->write_set, (*field)->field_index))
     {
       /* append the field name */
-      append_ident(&insert_string, (*field)->field_name, 
-                   strlen((*field)->field_name), ident_quote_char);
+      append_ident(&insert_string, (*field)->field_name.str,
+                   (*field)->field_name.length, ident_quote_char);
 
       /* append commas between both fields and fieldnames */
       /*
@@ -1926,11 +1926,11 @@ int ha_federated::write_row(uchar *buf)
     if (bulk_insert.length == 0)
     {
       char insert_buffer[FEDERATED_QUERY_BUFFER_SIZE];
-      String insert_string(insert_buffer, sizeof(insert_buffer), 
+      String insert_string(insert_buffer, sizeof(insert_buffer),
                            &my_charset_bin);
       insert_string.length(0);
       append_stmt_insert(&insert_string);
-      dynstr_append_mem(&bulk_insert, insert_string.ptr(), 
+      dynstr_append_mem(&bulk_insert, insert_string.ptr(),
                         insert_string.length());
     }
     else
@@ -2068,7 +2068,7 @@ int ha_federated::optimize(THD* thd, HA_CHECK_OPT* check_opt)
 
   query.set_charset(system_charset_info);
   query.append(STRING_WITH_LEN("OPTIMIZE TABLE "));
-  append_ident(&query, share->table_name, share->table_name_length, 
+  append_ident(&query, share->table_name, share->table_name_length,
                ident_quote_char);
 
   if (real_query(query.ptr(), query.length()))
@@ -2090,7 +2090,7 @@ int ha_federated::repair(THD* thd, HA_CHECK_OPT* check_opt)
 
   query.set_charset(system_charset_info);
   query.append(STRING_WITH_LEN("REPAIR TABLE "));
-  append_ident(&query, share->table_name, share->table_name_length, 
+  append_ident(&query, share->table_name, share->table_name_length,
                ident_quote_char);
   if (check_opt->flags & T_QUICK)
     query.append(STRING_WITH_LEN(" QUICK"));
@@ -2190,8 +2190,8 @@ int ha_federated::update_row(const uchar *old_data, const uchar *new_data)
   {
     if (bitmap_is_set(table->write_set, (*field)->field_index))
     {
-      size_t field_name_length= strlen((*field)->field_name);
-      append_ident(&update_string, (*field)->field_name, field_name_length,
+      append_ident(&update_string, (*field)->field_name.str,
+                   (*field)->field_name.length,
                    ident_quote_char);
       update_string.append(STRING_WITH_LEN(" = "));
 
@@ -2216,8 +2216,8 @@ int ha_federated::update_row(const uchar *old_data, const uchar *new_data)
 
     if (bitmap_is_set(table->read_set, (*field)->field_index))
     {
-      size_t field_name_length= strlen((*field)->field_name);
-      append_ident(&where_string, (*field)->field_name, field_name_length,
+      append_ident(&where_string, (*field)->field_name.str,
+                   (*field)->field_name.length,
                    ident_quote_char);
       if (field_in_record_is_null(table, *field, (char*) old_data))
         where_string.append(STRING_WITH_LEN(" IS NULL "));
@@ -2299,8 +2299,8 @@ int ha_federated::delete_row(const uchar *buf)
     found++;
     if (bitmap_is_set(table->read_set, cur_field->field_index))
     {
-      append_ident(&delete_string, (*field)->field_name,
-                   strlen((*field)->field_name), ident_quote_char);
+      append_ident(&delete_string, (*field)->field_name.str,
+                   (*field)->field_name.length, ident_quote_char);
       data_string.length(0);
       if (cur_field->is_null())
       {