Inefficient usage of String::append() fixed.

Bad examples of usage of a string with its length fixed.
The incorrect length in the trigger file configuration descriptor
  fixed (BUG#14090).
A hook for unknown keys added to the parser to support old .TRG files.


sql/field.cc:
  Inefficient usage of String::append() fixed.
  Bad examples of usage of a string with its length fixed.
sql/ha_berkeley.cc:
  A bad example of usage of a string with its length fixed.
sql/ha_federated.cc:
  Inefficient usage of String::append() fixed.
sql/ha_myisammrg.cc:
  Bad examples of usage of a string with its length fixed.
sql/handler.cc:
  Inefficient usage of String::append() fixed.
sql/item.cc:
  Bad examples of usage of a string with its length fixed.
sql/item.h:
  A bad example of usage of a string with its length fixed.
sql/item_cmpfunc.cc:
  Bad examples of usage of a string with its length fixed.
sql/item_func.cc:
  Bad examples of usage of a string with its length fixed.
sql/item_strfunc.cc:
  Bad examples of usage of a string with its length fixed.
sql/item_subselect.cc:
  Bad examples of usage of a string with its length fixed.
sql/item_sum.cc:
  Bad examples of usage of a string with its length fixed.
  Inefficient usage of String::append() fixed.
sql/item_timefunc.cc:
  Inefficient using of String::append() fixed.
  Bad examples of usage of a string with its length fixed.
sql/item_uniq.h:
  Bad examples of usage of a string with its length fixed.
sql/key.cc:
  Bad examples of usage of a string with its length fixed.
sql/log.cc:
  Bad examples of usage of a string with its length fixed.
sql/log_event.cc:
  Bad examples of usage of a string with its length fixed.
sql/mysqld.cc:
  The dummy parser hook allocated.
sql/opt_range.cc:
  Inefficient usage of String::append() fixed.
sql/parse_file.cc:
  Bad examples of usage of a string with its length fixed.
  A hook for unknown keys added to the parser.
sql/parse_file.h:
  A hook for unknown keys added to the parser.
sql/protocol.cc:
  A bad example of usage of a string with its length fixed.
sql/repl_failsafe.cc:
  Bad examples of usage of a string with its length fixed.
sql/share/errmsg.txt:
  A warning for old format config file.
sql/slave.cc:
  Bad examples of usage of a string with its length fixed.
sql/sp.cc:
  Bad examples of usage of a string with its length fixed.
sql/sp_head.cc:
  Bad examples of usage of a string with its length fixed.
sql/spatial.cc:
  A bad example of usage of a string with its length fixed.
sql/sql_acl.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_analyse.cc:
  Bad examples of usage of a string with its length fixed.
  Inefficient usage of String::append() fixed.
sql/sql_lex.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_load.cc:
  A bad example of usage of a string with its length fixed.
sql/sql_parse.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_prepare.cc:
  A bad example of usage of a string with its length fixed.
sql/sql_select.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_show.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_string.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_string.h:
  The macro definition moved to sql_string.h to
    be accessible in all parts of server.
sql/sql_table.cc:
  Bad examples of usage of a string with its length fixed.
sql/sql_trigger.cc:
  Bad examples of usage of a string with its length fixed.
  The incorrect length in the trigger file configuration descriptor
    fixed (BUG#14090).
  The hook for processing incorrect sql_mode record added.
sql/sql_view.cc:
  A dummy  hook used for parsing views.
sql/structs.h:
  The macro definition moved to sql_string.h to be
    accessible in all parts of server.
sql/table.cc:
  A bad example of usage of a string with its length fixed.
sql/tztime.cc:
  A bad example of usage of a string with its length fixed.

1 files changed, 23 insertions, 23 deletions

diff --git a/sql/sp_head.cc b/sql/sp_head.cc
index 08a189165b5..101f8213a3d 100644
--- a/sql/sp_head.cc
+++ b/sql/sp_head.cc
@@ -816,9 +816,9 @@ static bool subst_spvars(THD *thd, sp_instr *instr, LEX_STRING *query_str)
       prev_pos= (*splocal)->pos_in_query + (*splocal)->m_name.length;
       
       /* append the spvar substitute */
-      res|= qbuf.append(" NAME_CONST('");
+      res|= qbuf.append(STRING_WITH_LEN(" NAME_CONST('"));
       res|= qbuf.append((*splocal)->m_name.str, (*splocal)->m_name.length);
-      res|= qbuf.append("',");
+      res|= qbuf.append(STRING_WITH_LEN("',"));
       val= (*splocal)->this_item();
       DBUG_PRINT("info", ("print %p", val));
       val->print(&qbuf);
@@ -1173,7 +1173,7 @@ sp_head::execute_function(THD *thd, Item **argp, uint argcount, Item **resp)
     char buf[256];
     String bufstr(buf, sizeof(buf), &my_charset_bin);
     bufstr.length(0);
-    bufstr.append("DO ", 3);
+    bufstr.append(STRING_WITH_LEN("DO "));
     append_identifier(thd, &bufstr, m_name.str, m_name.length);
     bufstr.append('(');
     for (uint i=0; i < argcount; i++)
@@ -2014,7 +2014,7 @@ void
 sp_instr_stmt::print(String *str)
 {
   str->reserve(12);
-  str->append("stmt ");
+  str->append(STRING_WITH_LEN("stmt "));
   str->qs_append((uint)m_lex_keeper.sql_command());
 }
 
@@ -2055,7 +2055,7 @@ void
 sp_instr_set::print(String *str)
 {
   str->reserve(12);
-  str->append("set ");
+  str->append(STRING_WITH_LEN("set "));
   str->qs_append(m_offset);
   str->append(' ');
   m_value->print(str);
@@ -2090,9 +2090,9 @@ sp_instr_set_trigger_field::exec_core(THD *thd, uint *nextp)
 void
 sp_instr_set_trigger_field::print(String *str)
 {
-  str->append("set ", 4);
+  str->append(STRING_WITH_LEN("set "));
   trigger_field->print(str);
-  str->append(":=", 2);
+  str->append(STRING_WITH_LEN(":="));
   value->print(str);
 }
 
@@ -2115,7 +2115,7 @@ void
 sp_instr_jump::print(String *str)
 {
   str->reserve(12);
-  str->append("jump ");
+  str->append(STRING_WITH_LEN("jump "));
   str->qs_append(m_dest);
 }
 
@@ -2197,7 +2197,7 @@ void
 sp_instr_jump_if::print(String *str)
 {
   str->reserve(12);
-  str->append("jump_if ");
+  str->append(STRING_WITH_LEN("jump_if "));
   str->qs_append(m_dest);
   str->append(' ');
   m_expr->print(str);
@@ -2258,7 +2258,7 @@ void
 sp_instr_jump_if_not::print(String *str)
 {
   str->reserve(16);
-  str->append("jump_if_not ");
+  str->append(STRING_WITH_LEN("jump_if_not "));
   str->qs_append(m_dest);
   str->append(' ');
   m_expr->print(str);
@@ -2316,7 +2316,7 @@ void
 sp_instr_freturn::print(String *str)
 {
   str->reserve(12);
-  str->append("freturn ");
+  str->append(STRING_WITH_LEN("freturn "));
   str->qs_append((uint)m_type);
   str->append(' ');
   m_value->print(str);
@@ -2344,13 +2344,13 @@ void
 sp_instr_hpush_jump::print(String *str)
 {
   str->reserve(32);
-  str->append("hpush_jump ");
+  str->append(STRING_WITH_LEN("hpush_jump "));
   str->qs_append(m_dest);
-  str->append(" t=");
+  str->append(STRING_WITH_LEN(" t="));
   str->qs_append(m_type);
-  str->append(" f=");
+  str->append(STRING_WITH_LEN(" f="));
   str->qs_append(m_frame);
-  str->append(" h=");
+  str->append(STRING_WITH_LEN(" h="));
   str->qs_append(m_ip+1);
 }
 
@@ -2387,7 +2387,7 @@ void
 sp_instr_hpop::print(String *str)
 {
   str->reserve(12);
-  str->append("hpop ");
+  str->append(STRING_WITH_LEN("hpop "));
   str->qs_append(m_count);
 }
 
@@ -2422,7 +2422,7 @@ void
 sp_instr_hreturn::print(String *str)
 {
   str->reserve(16);
-  str->append("hreturn ");
+  str->append(STRING_WITH_LEN("hreturn "));
   str->qs_append(m_frame);
   if (m_dest)
   {
@@ -2474,7 +2474,7 @@ sp_instr_cpush::execute(THD *thd, uint *nextp)
 void
 sp_instr_cpush::print(String *str)
 {
-  str->append("cpush");
+  str->append(STRING_WITH_LEN("cpush"));
 }
 
 
@@ -2496,7 +2496,7 @@ void
 sp_instr_cpop::print(String *str)
 {
   str->reserve(12);
-  str->append("cpop ");
+  str->append(STRING_WITH_LEN("cpop "));
   str->qs_append(m_count);
 }
 
@@ -2571,7 +2571,7 @@ void
 sp_instr_copen::print(String *str)
 {
   str->reserve(12);
-  str->append("copen ");
+  str->append(STRING_WITH_LEN("copen "));
   str->qs_append(m_cursor);
 }
 
@@ -2600,7 +2600,7 @@ void
 sp_instr_cclose::print(String *str)
 {
   str->reserve(12);
-  str->append("cclose ");
+  str->append(STRING_WITH_LEN("cclose "));
   str->qs_append(m_cursor);
 }
 
@@ -2631,7 +2631,7 @@ sp_instr_cfetch::print(String *str)
   sp_pvar_t *pv;
 
   str->reserve(12);
-  str->append("cfetch ");
+  str->append(STRING_WITH_LEN("cfetch "));
   str->qs_append(m_cursor);
   while ((pv= li++))
   {
@@ -2661,7 +2661,7 @@ void
 sp_instr_error::print(String *str)
 {
   str->reserve(12);
-  str->append("error ");
+  str->append(STRING_WITH_LEN("error "));
   str->qs_append(m_errcode);
 }