1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-merge fixes in sp_head.cc (print methods).

Browse Source 
sql/sp_head.cc:
  Post-merge fixes.
  Use STRING_WITH_LEN in all print methods.
This commit is contained in:
unknown 2005-11-22 14:25:44 +01:00
parent d213bf0487
commit 899ca897c1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sp_head.cc
View File

@ -1898,7 +1898,7 @@ sp_head::show_routine_code(THD *thd)
List<Item> field_list; List<Item> field_list;
sp_instr *i; sp_instr *i;
bool full_access; bool full_access;
int res; int res= 0;
uint ip; uint ip;
DBUG_ENTER("sp_head::show_routine_code"); DBUG_ENTER("sp_head::show_routine_code");
DBUG_PRINT("info", ("procedure: %s", m_name.str)); DBUG_PRINT("info", ("procedure: %s", m_name.str));
@ -2106,7 +2106,7 @@ sp_instr_stmt::print(String *str)
return; return;
str->qs_append(STRING_WITH_LEN("stmt ")); str->qs_append(STRING_WITH_LEN("stmt "));
str->qs_append((uint)m_lex_keeper.sql_command()); str->qs_append((uint)m_lex_keeper.sql_command());
str->qs_append(" \"", 2); str->qs_append(STRING_WITH_LEN(" \""));
len= m_query.length; len= m_query.length;
/* /*
Print the query string (but not too much of it), just to indicate which Print the query string (but not too much of it), just to indicate which
@ -2123,7 +2123,7 @@ sp_instr_stmt::print(String *str)
str->qs_append(m_query.str[i]); str->qs_append(m_query.str[i]);
} }
if (m_query.length > SP_STMT_PRINT_MAXLEN) if (m_query.length > SP_STMT_PRINT_MAXLEN)
str->qs_append("...", 3); /* Indicate truncated string */ str->qs_append(STRING_WITH_LEN("...")); /* Indicate truncated string */
str->qs_append('"'); str->qs_append('"');
} }
#undef SP_STMT_PRINT_MAXLEN #undef SP_STMT_PRINT_MAXLEN
@ -2483,19 +2483,19 @@ sp_instr_hpush_jump::print(String *str)
switch (m_type) switch (m_type)
{ {
case SP_HANDLER_NONE: case SP_HANDLER_NONE:
str->qs_append(" NONE", 5); // This would be a bug str->qs_append(STRING_WITH_LEN(" NONE")); // This would be a bug
break; break;
case SP_HANDLER_EXIT: case SP_HANDLER_EXIT:
str->qs_append(" EXIT", 5); str->qs_append(STRING_WITH_LEN(" EXIT"));
break; break;
case SP_HANDLER_CONTINUE: case SP_HANDLER_CONTINUE:
str->qs_append(" CONTINUE", 9); str->qs_append(STRING_WITH_LEN(" CONTINUE"));
break; break;
case SP_HANDLER_UNDO: case SP_HANDLER_UNDO:
str->qs_append(" UNDO", 5); str->qs_append(STRING_WITH_LEN(" UNDO"));
break; break;
default: default:
str->qs_append(" UNKNOWN:", 9); // This would be a bug as well str->qs_append(STRING_WITH_LEN(" UNKNOWN:")); // This would be a bug as well
str->qs_append(m_type); str->qs_append(m_type);
} }
} }
@ -2633,7 +2633,7 @@ sp_instr_cpush::print(String *str)
rsrv+= n.length; rsrv+= n.length;
if (str->reserve(rsrv)) if (str->reserve(rsrv))
return; return;
str->qs_append(STRING_WITH_LENGTH("cpush ")); str->qs_append(STRING_WITH_LEN("cpush "));
if (found) if (found)
{ {
str->qs_append(n.str, n.length); str->qs_append(n.str, n.length);